sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Correction to last commit

Browse Source
This commit is contained in:
Mitchell Stokes 2014-04-28 16:33:26 -07:00
parent 3448822b2f
commit d8282da545
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/gameengine/Converter/BL_ActionActuator.cpp
View File

@ -253,19 +253,15 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
// Handle a finished animation // Handle a finished animation
if ((m_flag & ACT_FLAG_PLAY_END) && (m_flag & ACT_FLAG_ACTIVE) && obj->IsActionDone(m_layer)) if ((m_flag & ACT_FLAG_PLAY_END) && (m_flag & ACT_FLAG_ACTIVE) && obj->IsActionDone(m_layer))
{
if (m_playtype == ACT_ACTION_PINGPONG)
{
m_flag ^= ACT_FLAG_REVERSE;
}
else
{ {
m_flag &= ~ACT_FLAG_ACTIVE; m_flag &= ~ACT_FLAG_ACTIVE;
m_flag &= ~ACT_FLAG_ATTEMPT_PLAY; m_flag &= ~ACT_FLAG_ATTEMPT_PLAY;
if (m_playtype == ACT_ACTION_PINGPONG)
m_flag ^= ACT_FLAG_REVERSE;
else
return false; return false;
} }
}
// If a different action is playing, we've been overruled and are no longer active // If a different action is playing, we've been overruled and are no longer active
if (obj->GetCurrentAction(m_layer) != m_action && !obj->IsActionDone(m_layer)) if (obj->GetCurrentAction(m_layer) != m_action && !obj->IsActionDone(m_layer))