merge with 2.5 at r18948

2009-02-13 03:27:03 +00:00
parent 1773084201 ed7e211c2d
commit 209db3a64c
147 changed files with 14795 additions and 8163 deletions
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -371,7 +371,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 			obj->GetPose(&m_pose);
 			
 			/* Override the necessary channels with ones from the action */
-			extract_pose_from_action(m_pose, m_action, m_localtime);
+			// XXX extract_pose_from_action(m_pose, m_action, m_localtime);

 			/* Perform the user override (if any) */
 			if (m_userpose){