[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23549] trunk/blender/source: Removed the termporary defines added to make the Game Engine compile.

[Joshua Leung]

Revision: 23549
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23549
Author:   aligorith
Date:     2009-09-29 03:52:54 +0200 (Tue, 29 Sep 2009)

Log Message:
-----------
Removed the termporary defines added to make the Game Engine compile. Hopefully this fixes all of the cases which broke.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_action_types.h
    trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h	2009-09-28 22:14:03 UTC (rev 23548)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h	2009-09-29 01:52:54 UTC (rev 23549)
@@ -553,13 +553,4 @@
 	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

Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp	2009-09-28 22:14:03 UTC (rev 23548)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp	2009-09-29 01:52:54 UTC (rev 23549)
@@ -152,7 +152,7 @@
 	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);

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2009-09-28 22:14:03 UTC (rev 23548)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2009-09-29 01:52:54 UTC (rev 23549)
@@ -1259,13 +1259,13 @@
 	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())