[Bf-blender-cvs] [5d59a51] blender-v2.76-release: Fix T45886: cont.deactivate(ActionActuatorInPropertyMode) does not work
Mitchell Stokes
noreply at git.blender.org
Fri Oct 9 13:33:04 CEST 2015
Commit: 5d59a51acab16e27c42e197c25c0d68a063c152c
Author: Mitchell Stokes
Date: Sun Aug 23 19:56:51 2015 -0700
Branches: blender-v2.76-release
https://developer.blender.org/rB5d59a51acab16e27c42e197c25c0d68a063c152c
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
More information about the Bf-blender-cvs
mailing list