small merge needed for testing new animsys in 2.5 BGE, mixing own changes with merge...
[blender.git] / source / gameengine / Converter / BL_ActionActuator.cpp
index e18b821..0c7b99d 100644 (file)
@@ -43,6 +43,7 @@
 #include "BKE_action.h"
 #include "DNA_action_types.h"
 #include "DNA_armature_types.h"
+#include "DNA_scene_types.h"
 #include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
@@ -51,7 +52,6 @@
 #include "FloatValue.h"
 #include "PyObjectPlus.h"
 #include "KX_PyMath.h"
-#include "blendef.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -362,7 +362,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){
@@ -381,7 +381,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
                                
                                /* Find percentages */
                                newweight = (m_blendframe/(float)m_blendin);
-                               blend_poses(m_pose, m_blendpose, 1.0 - newweight, ACTSTRIPMODE_BLEND);
+                               // XXX blend_poses(m_pose, m_blendpose, 1.0 - newweight, ACTSTRIPMODE_BLEND);
 
                                /* Increment current blending percentage */
                                m_blendframe = (curtime - m_blendstart)*KX_KetsjiEngine::GetAnimFrameRate();