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:
authorKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2005-03-25 13:35:31 +0300
committerKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2005-03-25 13:35:31 +0300
commitcf30d9443d76b2502a91b1d3f20847c85d3b88e8 (patch)
tree2ae1be1a8cb641a6b113301756f7386774d2f3f5 /source/blender/src/buttons_logic.c
parentc844aa265ad4eb50ad0e18661470fa6092052728 (diff)
Patch from Erwin Coumans: Abstract the physics engine.
Reenable ODE in the physics engine buttons.
Diffstat (limited to 'source/blender/src/buttons_logic.c')
-rw-r--r--source/blender/src/buttons_logic.c5
1 files changed, 3 insertions, 2 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);