Merge of itasc branch. Project files, scons and cmake should be working. Makefile...
[blender.git] / source / gameengine / Converter / BL_ActionActuator.cpp
index ca42907..2f0e3e9 100644 (file)
@@ -526,12 +526,11 @@ KX_PYMETHODDEF_DOC(BL_ActionActuator, setChannel,
                mat.setValue((const float *)matrix);
                
                BL_ArmatureObject *obj = (BL_ArmatureObject*)GetParent();
                mat.setValue((const float *)matrix);
                
                BL_ArmatureObject *obj = (BL_ArmatureObject*)GetParent();
-               obj->GetPose(&m_pose); /* Get the underlying pose from the armature */
                
                if (!m_userpose) {
                        if(!m_pose)
                                obj->GetPose(&m_pose); /* Get the underlying pose from the armature */
                
                if (!m_userpose) {
                        if(!m_pose)
                                obj->GetPose(&m_pose); /* Get the underlying pose from the armature */
-                       game_copy_pose(&m_userpose, m_pose);
+                       game_copy_pose(&m_userpose, m_pose, 0);
                }
                // pchan= verify_pose_channel(m_userpose, string); // adds the channel if its not there.
                pchan= get_pose_channel(m_userpose, string); // adds the channel if its not there.
                }
                // pchan= verify_pose_channel(m_userpose, string); // adds the channel if its not there.
                pchan= get_pose_channel(m_userpose, string); // adds the channel if its not there.
@@ -554,7 +553,7 @@ KX_PYMETHODDEF_DOC(BL_ActionActuator, setChannel,
                if (!m_userpose) {
                        if(!m_pose)
                                obj->GetPose(&m_pose); /* Get the underlying pose from the armature */
                if (!m_userpose) {
                        if(!m_pose)
                                obj->GetPose(&m_pose); /* Get the underlying pose from the armature */
-                       game_copy_pose(&m_userpose, m_pose);
+                       game_copy_pose(&m_userpose, m_pose, 0);
                }
                // pchan= verify_pose_channel(m_userpose, string);
                pchan= get_pose_channel(m_userpose, string); // adds the channel if its not there.
                }
                // pchan= verify_pose_channel(m_userpose, string);
                pchan= get_pose_channel(m_userpose, string); // adds the channel if its not there.
@@ -572,7 +571,6 @@ KX_PYMETHODDEF_DOC(BL_ActionActuator, setChannel,
                return NULL;
        }
        
                return NULL;
        }
        
-       pchan->flag |= POSE_ROT|POSE_LOC|POSE_SIZE;
        Py_RETURN_NONE;
 }
 
        Py_RETURN_NONE;
 }