I'll break this commit into two sections in the moto files

[blender-staging.git] / source / gameengine / Converter / KX_BlenderSceneConverter.cpp

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 8e552d3f3d4c14032e4f37686dc33099ad83c32b..283710a5d5b434db7542849583aa56ada31ebcad 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"
@@ -118,7 +114,9 @@ KX_BlenderSceneConverter::~KX_BlenderSceneConverter()
                itm++;
        }
        
+#ifdef USE_SUMO_SOLID
        KX_ClearSumoSharedShapes();
+#endif
 }
 
 
@@ -177,11 +175,8 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
 
        e_PhysicsEngine physics_engine = UseSumo;
 
-       /* FIXME: Force physics engine = sumo.
-       This isn't really a problem - no other physics engines are available. 
        if (blenderscene)
        {
-               int i=0;
        
                if (blenderscene->world)
                {
@@ -211,7 +206,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
                  
                }
        }
-       */
+
        switch (physics_engine)
        {
        
@@ -221,6 +216,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
                        break;
 #endif
 #ifdef USE_ODE
+
                case UseODE:
                        destinationscene ->SetPhysicsEnvironment(new ODEPhysicsEnvironment());
                        break;