1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 20:29:10 +00:00

Fixes for plAvatar

This commit is contained in:
Florian Meißner
2014-01-23 16:27:11 +01:00
parent 3d1bcf1988
commit cedc2482e3
16 changed files with 64 additions and 74 deletions

View File

@ -317,9 +317,12 @@ void plMatrixTimeScale::Dump(int indent, bool optimized, double time)
// ctor ----------------------
// -----
plMatrixBlend::plMatrixBlend()
: fChannelA(nil),
fChannelB(nil),
fChannelBias(nil)
: fChannelA(nullptr),
fOptimizedA(nullptr),
fChannelB(nullptr),
fOptimizedB(nullptr),
fChannelBias(nullptr),
fPriority(0)
{
}
@ -793,11 +796,8 @@ void plMatrixDelayedCorrectionApplicator::SetCorrection(hsMatrix44 &cor)
bool plMatrixDelayedCorrectionApplicator::CanBlend(plAGApplicator *app)
{
plMatrixChannelApplicator *matChannelApp = plMatrixChannelApplicator::ConvertNoRef(app);
if( plMatrixChannelApplicator::ConvertNoRef(app) )
{
if (matChannelApp)
return true;
}
return false;
}
@ -875,11 +875,8 @@ void plMatrixDifferenceApp::Reset(double time)
bool plMatrixDifferenceApp::CanBlend(plAGApplicator *app)
{
plMatrixChannelApplicator *matChannelApp = plMatrixChannelApplicator::ConvertNoRef(app);
if( plMatrixChannelApplicator::ConvertNoRef(app) )
{
if (matChannelApp)
return true;
}
return false;
}