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/blender')
-rw-r--r--source/blender/src/buttons_logic.c5
-rw-r--r--source/blender/src/buttons_shading.c2
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");