Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / source / gameengine / Converter / BL_ArmatureObject.cpp
index 08567dde84082693db339843e90959eb17f957e3..f73d5b42a016673ed564cd89b1b6c9db327b4118 100644 (file)
@@ -92,9 +92,10 @@ BL_ArmatureObject::~BL_ArmatureObject()
 /* there is only 1 unique Pose per Armature */
 void BL_ArmatureObject::ApplyPose()
 {
-       if (m_pose){
+       if (m_pose) {
                // copy to armature object
-               extract_pose_from_pose(m_objArma->pose, m_pose);
+               if (m_objArma->pose != m_pose)/* This should never happen but it does - Campbell */
+                       extract_pose_from_pose(m_objArma->pose, m_pose);
                
                // is this needed anymore?
                //if (!m_mrdPose)
@@ -143,7 +144,7 @@ void BL_ArmatureObject::GetPose(bPose **pose)
 {
        /* If the caller supplies a null pose, create a new one. */
        /* Otherwise, copy the armature's pose channels into the caller-supplied pose */
-
+               
        if (!*pose) {
                /*      probably not to good of an idea to
                        duplicate everying, but it clears up