diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-09-29 05:52:54 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-09-29 05:52:54 +0400 |
commit | 52b28fddeca3a2fe1e2f0d415109b433226c29e8 (patch) | |
tree | c80cb22520e10dd864d1cf9935bffa48350bf814 /source | |
parent | be3000773b4d0860a4c7bb1d262deaf655e2b522 (diff) |
Removed the termporary defines added to make the Game Engine compile. Hopefully this fixes all of the cases which broke.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 9 | ||||
-rw-r--r-- | source/gameengine/Converter/BL_ArmatureObject.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 14 |
3 files changed, 8 insertions, 17 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 2853b2cb029..3201a1df6a5 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -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 diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index d5660d9ef84..54c1e8fc718 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -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); diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index bef00fb7a06..36126b26a59 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -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()) |