Revision: 37991
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37991
Author: moguri
Date: 2011-06-30 20:08:05 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
BGE Animations: Fixing a bug where an action actuator could update a frame
property when it wasn't active.
Modified Paths:
--------------
branches/soc-2011-pepper/source/gameengine/Converter/BL_ActionActuator.cpp
Modified:
branches/soc-2011-pepper/source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
--- branches/soc-2011-pepper/source/gameengine/Converter/BL_ActionActuator.cpp
2011-06-30 19:33:13 UTC (rev 37990)
+++ branches/soc-2011-pepper/source/gameengine/Converter/BL_ActionActuator.cpp
2011-06-30 20:08:05 UTC (rev 37991)
@@ -213,7 +213,7 @@
}
// Handle a frame property if it's defined
- if (m_framepropname[0] != 0)
+ if (m_is_going && m_framepropname[0] != 0)
{
CValue* oldprop = obj->GetProperty(m_framepropname);
CValue* newval = new CFloatValue(obj->GetActionFrame(m_layer));
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
