Removed the termporary defines added to make the Game Engine compile. Hopefully this...
authorJoshua Leung <aligorith@gmail.com>
Tue, 29 Sep 2009 01:52:54 +0000 (01:52 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 29 Sep 2009 01:52:54 +0000 (01:52 +0000)
source/blender/makesdna/DNA_action_types.h
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp

index 2853b2cb029b58c028e601f8ef10657b063c4a00..3201a1df6a50572ca2e254038b9bddc07aeadcf4 100644 (file)
@@ -553,13 +553,4 @@ typedef enum ACHAN_FLAG {
        ACHAN_MOVED     = (1<<31),
 } ACHAN_FLAG; 
 
-// XXX Incorrect, Temp for building
-#define PCHAN_ROT_QUAT -1
-#define PCHAN_ROT_XYZ -1 
-#define PCHAN_ROT_XZY -1 
-#define PCHAN_ROT_YXZ -1 
-#define PCHAN_ROT_YZX -1 
-#define PCHAN_ROT_ZXY -1 
-#define PCHAN_ROT_ZYX -1 
-
 #endif
index d5660d9ef84c68e9f5739815d64b69744109914c..54c1e8fc718279e0540ff3b52aec3e099f4110c6 100644 (file)
@@ -152,7 +152,7 @@ void game_blend_poses(bPose *dst, bPose *src, float srcweight/*, short mode*/)
        for (dchan = (bPoseChannel*)dst->chanbase.first; dchan; dchan=(bPoseChannel*)dchan->next, schan= (bPoseChannel*)schan->next){
                // always blend on all channels since we don't know which one has been set
                /* quat interpolation done separate */
-               if (schan->rotmode == PCHAN_ROT_QUAT) {
+               if (schan->rotmode == ROT_MODE_QUAT) {
                        float dquat[4], squat[4];
                        
                        QUATCOPY(dquat, dchan->quat);
index bef00fb7a06ec86ec1d3f890880cfe57d159e355..36126b26a5963eaf3786d638166df03b9c0d90a1 100644 (file)
@@ -1259,13 +1259,13 @@ PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack
        KX_MACRO_addTypesToDict(d, KX_ACT_ARMATURE_SETWEIGHT, ACT_ARM_SETWEIGHT);
 
        /* BL_Armature Channel rotation_mode */
-       KX_MACRO_addTypesToDict(d, PCHAN_ROT_QUAT, PCHAN_ROT_QUAT);
-       KX_MACRO_addTypesToDict(d, PCHAN_ROT_XYZ, PCHAN_ROT_XYZ);
-       KX_MACRO_addTypesToDict(d, PCHAN_ROT_XZY, PCHAN_ROT_XZY);
-       KX_MACRO_addTypesToDict(d, PCHAN_ROT_YXZ, PCHAN_ROT_YXZ);
-       KX_MACRO_addTypesToDict(d, PCHAN_ROT_YZX, PCHAN_ROT_YZX);
-       KX_MACRO_addTypesToDict(d, PCHAN_ROT_ZXY, PCHAN_ROT_ZXY);
-       KX_MACRO_addTypesToDict(d, PCHAN_ROT_ZYX, PCHAN_ROT_ZYX);
+       KX_MACRO_addTypesToDict(d, ROT_MODE_QUAT, ROT_MODE_QUAT);
+       KX_MACRO_addTypesToDict(d, ROT_MODE_XYZ, ROT_MODE_XYZ);
+       KX_MACRO_addTypesToDict(d, ROT_MODE_XZY, ROT_MODE_XZY);
+       KX_MACRO_addTypesToDict(d, ROT_MODE_YXZ, ROT_MODE_YXZ);
+       KX_MACRO_addTypesToDict(d, ROT_MODE_YZX, ROT_MODE_YZX);
+       KX_MACRO_addTypesToDict(d, ROT_MODE_ZXY, ROT_MODE_ZXY);
+       KX_MACRO_addTypesToDict(d, ROT_MODE_ZYX, ROT_MODE_ZYX);
 
        // Check for errors
        if (PyErr_Occurred())