archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Patch from Erwin Coumans: Abstract the physics engine.

Browse Source 
Reenable ODE in the physics engine buttons.
This commit is contained in:
Kester Maddock
2005-03-25 10:35:31 +00:00
parent c844aa265a
commit cf30d9443d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/buttons_logic.c
View File

@@ -2498,8 +2498,9 @@ void logic_buts(void)
uiBlockSetCol(block, TH_BUT_SETTING2); uiBlockSetCol(block, TH_BUT_SETTING2);
if(wrld) { if(wrld) {
if (wrld->physicsEngine == 1) buttons_enji(block, ob); if
if ( (wrld->physicsEngine == 4) || (wrld->physicsEngine == 2) ) (wrld->physicsEngine == 1) buttons_enji(block, ob);
else
buttons_ketsji(block, ob); buttons_ketsji(block, ob);
} }
else buttons_ketsji(block, ob); else buttons_ketsji(block, ob);

2
source/blender/src/buttons_shading.c
View File

@@ -1858,7 +1858,7 @@ static void world_panel_mistaph(World *wrld)
#if GAMEBLENDER == 1 #if GAMEBLENDER == 1
uiDefButI(block, MENU, 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, 10,180,140,19, &wrld->physicsEngine, 0, 0, 0, 0,
"Physics Engine"); "Physics Engine");