Reordered some of the includes to fix STL issues.

For details, see:
http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=5867

Kent

diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 1c3f57e965a51b05e85d45a1e506c1c5afaa91aa..5587cbd9c5efa385c48509be06cb46415f7b56ad 100644 (file)
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -33,6 +33,7 @@
 #ifndef BL_ACTIONACTUATOR
 #define BL_ACTIONACTUATOR
 
+#include "GEN_HashedPtr.h"
 #include "SCA_IActuator.h"
 #include "MT_Point3.h"
 

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h
index 29e1a29a1496c783b77fa4f081ba25b00bae0e47..56dc5bfa8b2ad79e62377672ff1786a8b9f794e6 100644 (file)
--- a/source/gameengine/Converter/BL_BlenderDataConversion.h
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.h
@@ -32,6 +32,7 @@
 #ifndef __BLENDER_CONVERT
 #define __BLENDER_CONVERT
 
+#include "GEN_HashedPtr.h"
 #include "STR_String.h"
 #include "KX_Python.h"
 #include "KX_PhysicsEngineEnums.h"

diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index 4701422a71f66b5bde95f0f5c0add607cecf340d..d985f424f9acffefd0bb9b9c7506638a3a4402eb 100644 (file)
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -30,21 +30,17 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif //WIN32
 
+#include "BL_SkinDeformer.h"
 #include "GEN_Map.h"
 #include "STR_HashedString.h"
 #include "RAS_IPolygonMaterial.h"
 #include "BL_SkinMeshObject.h"
 
 //#include "BL_ArmatureController.h"
-#include "BL_SkinDeformer.h"
 #include "DNA_armature_types.h"
 #include "DNA_action_types.h"
 #include "DNA_mesh_types.h"

diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index 549f915a285911fd5ec1aa160437d6fd20ca7899..255537e5b7acd6cd735ab9d578a25b42b883b146 100644 (file)
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -37,6 +37,7 @@
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
 
+#include "GEN_HashedPtr.h"
 #include "BL_MeshDeformer.h"
 #include "BL_ArmatureObject.h"
 

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index e8f0c2997e7f5c7d4b5411c2d440e9a9439a776c..6b3cbbea2e5d1e7b752fa420977ac7b609c4c1ab 100644 (file)
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -29,17 +29,13 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
        #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
 #endif
 
-
 #include "KX_Scene.h"
 #include "KX_GameObject.h"
+#include "KX_BlenderSceneConverter.h"
 #include "KX_IpoConvert.h"
 #include "RAS_MeshObject.h"
 #include "KX_PhysicsEngineEnums.h"

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index 2a15d5e2f0d5aadde1522dfaad89384a6f417966..c5759c84bebd1b92df48de9bf924749e9798499b 100644 (file)
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -32,10 +32,10 @@
 #ifndef __KX_BLENDERSCENECONVERTER_H
 #define __KX_BLENDERSCENECONVERTER_H
 
+#include "KX_HashedPtr.h"
 #include "GEN_Map.h"
 
 #include "KX_ISceneConverter.h"
-#include "KX_HashedPtr.h"
 #include "KX_IpoConvert.h"
 
 class KX_WorldInfo;

diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index ed2f2100589556885e0597c640fc44823889f09c..9c60bc0f32ff7785b8d5b9d6ec209bf10b88fc8c 100644 (file)
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -51,10 +51,6 @@
 
 #include "KX_MotionState.h" // bridge between motionstate and scenegraph node
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef USE_ODE
 
 #include "KX_OdePhysicsController.h"

diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 017de1acaf8e1353e06cd6dba896dd6f1090fd91..2046c52355c074b3a93ddf51a899aa2cab399da2 100644 (file)
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -31,19 +31,15 @@
  * Ketsji scene. Holds references to all scene data.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif //WIN32
 
+#include "KX_Scene.h"
 #include "MT_assert.h"
 
 #include "KX_KetsjiEngine.h"
 #include "RAS_IPolygonMaterial.h"
-#include "KX_Scene.h"
 #include "ListValue.h"
 #include "SCA_LogicManager.h"
 #include "SCA_TimeEventManager.h"