Commit: 077b4ab846c37ad2456ec6f8f3501d55f42c4ccc
Author: Mitchell Stokes
Date: Sun Aug 23 19:56:51 2015 -0700
Branches: master
https://developer.blender.org/rB077b4ab846c37ad2456ec6f8f3501d55f42c4ccc
Fix T45886: cont.deactivate(ActionActuatorInPropertyMode) does not work
Make sure the Action Actuator actually deactivates when given a negative
event while using the property play mode.
===================================================================
M source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp
b/source/gameengine/Converter/BL_ActionActuator.cpp
index d4cfeb2..372be85 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -307,6 +307,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
}
switch (m_playtype) {
+ case ACT_ACTION_FROM_PROP:
case ACT_ACTION_LOOP_STOP:
obj->StopAction(m_layer); // Stop the action
after getting the frame
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
