diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-09-29 11:17:12 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-09-29 11:17:12 +0400 |
| commit | 2c289a02b6907204ba322071938578554d5409f7 (patch) | |
| tree | c15ed7e80c17388a6cd9732c68305a5e81fed8ac /source/blender/src/buttons_logic.c | |
| parent | cef5c4b76508d826959fb46f3f77ba0af029046f (diff) | |
Clarify that in Bullet, the 'radius' is used for both sphere bounds, but also for Fh/Rot Fh.
So even if other bound types are used (such as box etc), the radius will be used for Fh/Rot Fh.
Diffstat (limited to 'source/blender/src/buttons_logic.c')
| -rw-r--r-- | source/blender/src/buttons_logic.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 54a53c08a55..5fbbf4d80c3 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -3132,16 +3132,11 @@ void buttons_bullet(uiBlock *block, Object *ob) if (!(ob->gameflag & OB_SOFT_BODY)) { - if (!(ob->gameflag & OB_BOUNDS) || (ob->boundtype==OB_BOUND_SPHERE)) - { - uiDefButF(block, NUM, REDRAWVIEW3D, "Radius:", 140, 185, 130, 19, + + uiDefButF(block, NUM, REDRAWVIEW3D, "Radius:", 140, 185, 130, 19, &ob->inertia, 0.01, 10.0, 10, 2, - "Bounding sphere radius"); - } else - { - uiBlockEndAlign(block); - uiBlockBeginAlign(block); - } + "Radius for Bounding sphere and Fh/Fh Rot"); + uiDefButBitI(block, TOG, OB_COLLISION_RESPONSE, B_REDR, "No sleeping", 270,185,80,19, &ob->gameflag, 0, 0, 0, 0, "Disable auto (de)activation"); |