Commit: 1999b5a8147129ac7b82a5e57420ab8e5d7734a2
Author: Mitchell Stokes
Date: Wed Dec 10 21:20:19 2014 -0800
Branches: master
https://developer.blender.org/rB1999b5a8147129ac7b82a5e57420ab8e5d7734a2
Fix ping-pong actions when using the Action Actuator.
===================================================================
M source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp
b/source/gameengine/Converter/BL_ActionActuator.cpp
index f1a7287..c756d86 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -256,12 +256,14 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
if ((m_flag & ACT_FLAG_PLAY_END) && (m_flag & ACT_FLAG_ACTIVE) &&
obj->IsActionDone(m_layer))
{
m_flag &= ~ACT_FLAG_ACTIVE;
- m_flag &= ~ACT_FLAG_ATTEMPT_PLAY;
- if (m_playtype == ACT_ACTION_PINGPONG)
+ if (m_playtype == ACT_ACTION_PINGPONG) {
m_flag ^= ACT_FLAG_REVERSE;
- else
+ }
+ else {
+ m_flag &= ~ACT_FLAG_ATTEMPT_PLAY;
return false;
+ }
}
// If a different action is playing, we've been overruled and are no
longer active
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
