Revision: 16813
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16813
Author: erwin
Date: 2008-09-29 09:17:12 +0200 (Mon, 29 Sep 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_logic.c
Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c 2008-09-29 06:58:49 UTC
(rev 16812)
+++ trunk/blender/source/blender/src/buttons_logic.c 2008-09-29 07:17:12 UTC
(rev 16813)
@@ -3132,16 +3132,11 @@
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");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs