diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-05-10 04:30:35 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-05-10 04:30:35 +0400 |
| commit | 4c9f07e59ff4afad736361766670cd8b60bf9614 (patch) | |
| tree | 0f47a5d86ef8deb28181b9fba6eef7dc01926e19 /source | |
| parent | bcc6704299ece695ff7312cdda10eebfdac000d7 (diff) | |
Disabled Sumo, and use Bullet physics instead.
Until too many people complain: People can use older versions of Blender / player if they really need Sumo.
Sumo is not supported by anyone, and Bullet needs more feedback.
Note: Sumo is not removed yet, because no discussion is started about this. It's currently just a simple switch that replaced Sumo by Bullet.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/buttons_shading.c | 3 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 42a0ff1b190..6cd8dcdbe34 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1741,7 +1741,8 @@ static void world_panel_mistaph(World *wrld) #ifdef USE_ODE "Physics %t|None %x0|Sumo %x2|Ode %x4 |Bullet %x5", #else - "Physics %t|None %x0|Sumo %x2|Bullet %x5", + //"Physics %t|None %x0|Sumo %x2|Bullet %x5", //disable Sumo, until too many people complain ;-) + "Physics %t|None %x0|Bullet %x2|Bullet %x5", #endif 10,180,140,19, &wrld->physicsEngine, 0, 0, 0, 0, "Physics Engine"); diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index e06733ae919..ae117be8093 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -281,7 +281,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename, } case WOPHY_SUMO: { - physics_engine = UseSumo; + physics_engine = UseBullet;//UseSumo; //disable Sumo, just use Bullet for now (unless too many people complain) break; } case WOPHY_NONE: |