Revision: 17004
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17004
Author: erwin
Date: 2008-10-10 07:32:04 +0200 (Fri, 10 Oct 2008)
Log Message:
-----------
fix: leave default behaviour the same to be backward compatible with previous
rigid body constraints: No Collision between linked objects if button is
pressed.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_object.c
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2008-10-10 05:17:47 UTC
(rev 17003)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-10-10 05:32:04 UTC
(rev 17004)
@@ -1508,7 +1508,7 @@
uiDefButI(block, MENU, B_CONSTRAINT_TEST,
"Joint Types%t|Ball%x1|Hinge%x2|Cone Twist%x4|Generic
(experimental)%x12",//|Extra Force%x6",
*xco, *yco-25, 150, 18, &data->type, 0, 0, 0, 0, "Choose the
joint type");
- uiDefButBitS(block, TOG,
CONSTRAINT_DISABLE_LINKED_COLLISION, B_CONSTRAINT_TEST, "Collision", *xco+155,
*yco-25, 111, 18, &data->flag, 0, 24, 0, 0, "Enable Collision Between Linked
Bodies");
+ uiDefButBitS(block, TOG,
CONSTRAINT_DISABLE_LINKED_COLLISION, B_CONSTRAINT_TEST, "No Col.", *xco+155,
*yco-25, 111, 18, &data->flag, 0, 24, 0, 0, "Disable Collision Between Linked
Bodies");
uiDefIDPoinBut(block, test_obpoin_but, ID_OB,
B_CONSTRAINT_CHANGETARGET, "toObject:", *xco, *yco-50, 130, 18, &data->tar,
"Child Object");
Modified:
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
2008-10-10 05:17:47 UTC (rev 17003)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
2008-10-10 05:32:04 UTC (rev 17004)
@@ -887,7 +887,7 @@
)
{
- bool disableCollisionBetweenLinkedBodies = (0==(flags &
CCD_CONSTRAINT_DISABLE_LINKED_COLLISION));
+ bool disableCollisionBetweenLinkedBodies = (0!=(flags &
CCD_CONSTRAINT_DISABLE_LINKED_COLLISION));
//we could either add some logic to recognize ball-socket and hinge, or
let that up to the user
//perhaps some warning or hint that hinge/ball-socket is more efficient?
@@ -1496,7 +1496,7 @@
)
{
- bool disableCollisionBetweenLinkedBodies = (0==(flags &
CCD_CONSTRAINT_DISABLE_LINKED_COLLISION));
+ bool disableCollisionBetweenLinkedBodies = (0!=(flags &
CCD_CONSTRAINT_DISABLE_LINKED_COLLISION));
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
