diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-12-01 04:04:27 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-12-01 04:04:27 +0300 |
| commit | 4941107f927c3717a113b82463193caae0022d8c (patch) | |
| tree | 2f4de94b1bb53233e54f49a732a0f4d90df14bf8 /source/blender/src/buttons_logic.c | |
| parent | 51ce503cb24de6fa928555359acce77beed8995e (diff) | |
- enabled compound collision objects, requires 'clear parent inverse'
- fixed some issues with kinematic objects, introduced during Bullet 2.x upgrade
Diffstat (limited to 'source/blender/src/buttons_logic.c')
| -rw-r--r-- | source/blender/src/buttons_logic.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index cc9d9fd5999..0292a737d80 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -2444,8 +2444,12 @@ void buttons_ketsji(uiBlock *block, Object *ob) &ob->gameflag, 0, 0,0, 0, "Specify a bounds object for physics"); if (ob->gameflag & OB_BOUNDS) { - uiDefButS(block, MENU, REDRAWVIEW3D, "Boundary Display%t|Box%x0|Sphere%x1|Cylinder%x2|Cone%x3|Convex Hull Polytope%x5|Static TriangleMesh %x4|", - 85, 125, 140, 19, &ob->boundtype, 0, 0, 0, 0, "Selects the collision type"); + uiDefButS(block, MENU, REDRAWVIEW3D, "Boundary Display%t|Box%x0|Sphere%x1|Cylinder%x2|Cone%x3|Convex Hull Polytope%x5|Static TriangleMesh %x4", + //almost ready to enable this one: uiDefButS(block, MENU, REDRAWVIEW3D, "Boundary Display%t|Box%x0|Sphere%x1|Cylinder%x2|Cone%x3|Convex Hull Polytope%x5|Static TriangleMesh %x4|Dynamic Mesh %x5|", + 85, 125, 160, 19, &ob->boundtype, 0, 0, 0, 0, "Selects the collision type"); + uiDefButBitI(block, TOG, OB_CHILD, B_REDR, "Compound", 250,125,100,19, + &ob->gameflag, 0, 0, 0, 0, + "Add Children"); } } } |