diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-03-25 13:35:31 +0300 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-03-25 13:35:31 +0300 |
| commit | cf30d9443d76b2502a91b1d3f20847c85d3b88e8 (patch) | |
| tree | 2ae1be1a8cb641a6b113301756f7386774d2f3f5 /source/blender | |
| parent | c844aa265ad4eb50ad0e18661470fa6092052728 (diff) | |
Patch from Erwin Coumans: Abstract the physics engine.
Reenable ODE in the physics engine buttons.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/src/buttons_logic.c | 5 | ||||
| -rw-r--r-- | source/blender/src/buttons_shading.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 42486b9ce33..10bf9a907fe 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -2498,8 +2498,9 @@ void logic_buts(void) uiBlockSetCol(block, TH_BUT_SETTING2); if(wrld) { - if (wrld->physicsEngine == 1) buttons_enji(block, ob); - if ( (wrld->physicsEngine == 4) || (wrld->physicsEngine == 2) ) + if + (wrld->physicsEngine == 1) buttons_enji(block, ob); + else buttons_ketsji(block, ob); } else buttons_ketsji(block, ob); diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index faa44e2e9f0..6e1be265ddf 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1858,7 +1858,7 @@ static void world_panel_mistaph(World *wrld) #if GAMEBLENDER == 1 uiDefButI(block, MENU, 1, - "Physics %t|None %x0|Sumo %x2", + "Physics %t|None %x0|Sumo %x2|Ode %x4", 10,180,140,19, &wrld->physicsEngine, 0, 0, 0, 0, "Physics Engine"); |