merge with trunk at r31523
[blender.git] / source / gameengine / Converter / BL_ArmatureObject.cpp
index 217011517eb38d5c335e1bcbde6bb0173c3d7683..5d05dfcff521dace8ca63a16696d81f8d1fad52c 100644 (file)
@@ -30,6 +30,7 @@
 #include "BL_ArmatureObject.h"
 #include "BL_ActionActuator.h"
 #include "KX_BlenderSceneConverter.h"
+#include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"
@@ -64,8 +65,7 @@
  * When it is about to evaluate the pose, set the KX object position in the obmat of the corresponding
  * Blender objects and restore after the evaluation.
  */
-void game_copy_pose(bPose **dst, bPose *src, int copy_constraint)
-{
+void game_copy_pose(bPose **dst, bPose *src, int copy_constraint) {
        bPose *out;
        bPoseChannel *pchan, *outpchan;
        GHash *ghash;
@@ -114,6 +114,11 @@ void game_copy_pose(bPose **dst, bPose *src, int copy_constraint)
                        pchan->constraints.first = NULL;
                        pchan->constraints.last = NULL;
                }
+
+               // fails to link, props are not used in the BGE yet.
+               /* if(pchan->prop)
+                       pchan->prop= IDP_CopyProperty(pchan->prop); */
+               pchan->prop= NULL;
        }
 
        BLI_ghash_free(ghash, NULL, NULL);