Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.cpp')
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index fdba851b7a3..a043291c5d5 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -43,12 +43,13 @@
#include "DummyPhysicsEnvironment.h"
+//to decide to use sumo/ode or dummy physics - defines USE_ODE
+#include "KX_ConvertPhysicsObject.h"
+
#ifdef USE_ODE
#include "OdePhysicsEnvironment.h"
#endif //USE_ODE
-//to decide to use sumo/ode or dummy physics
-#include "KX_ConvertPhysicsObject.h"
#ifdef USE_SUMO_SOLID
#include "SumoPhysicsEnvironment.h"
#endif
@@ -181,24 +182,29 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
switch (blenderscene->world->pad1)
{
- case 4:
+ case 1:
{
- physics_engine = UseODE;
+ physics_engine = UseNone;
+ break;
+ };
+ case 2:
+ {
+ physics_engine = UseSumo;
break;
}
- case 5:
+ case 3:
{
- physics_engine = UseDynamo;
+ physics_engine = UseODE;
break;
}
- case 7:
+ case 4:
{
- physics_engine = UseNone;
+ physics_engine = UseDynamo;
break;
- };
+ }
default:
{
- physics_engine = UseSumo;
+ physics_engine = UseODE;
}
}
}