diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-10-12 00:19:04 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-10-12 00:19:04 +0400 |
| commit | 3cac11a3a2e61555c48c559f9caa61b1787e9ddb (patch) | |
| tree | fb6d296fcfb5a43796b3e3ac7bf55bac6092dd73 /source | |
| parent | b79063bd572df28aa91a4079cc736b3a83e52363 (diff) | |
Last (hopefully) soft body fixes:
Enable soft body collision clusters by default.
Add option to 'disable collision' button between soft body and rigid body connected by constraint (option was already available between two rigid bodies)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/bullet.c | 1 | ||||
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/bullet.c b/source/blender/blenkernel/intern/bullet.c index eeec4d0bd4e..b389f8c0536 100644 --- a/source/blender/blenkernel/intern/bullet.c +++ b/source/blender/blenkernel/intern/bullet.c @@ -78,6 +78,7 @@ BulletSoftBody *bsbNew(void) bsb->kSHR = 1.0f; bsb->kAHR = 0.7f; + bsb->collisionflags = 0; //bsb->collisionflags = OB_BSB_COL_CL_RS + OB_BSB_COL_CL_SS; bsb->numclusteriterations = 64; diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 505db944097..4fe35630784 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -1581,7 +1581,7 @@ int CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl { if (rb1) { - sb0->appendAnchor(node,rb1); + sb0->appendAnchor(node,rb1,disableCollisionBetweenLinkedBodies); } else { sb0->setMass(node,0.f); @@ -1643,7 +1643,7 @@ int CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl { if (rb0) { - sb1->appendAnchor(node,rb0); + sb1->appendAnchor(node,rb0,disableCollisionBetweenLinkedBodies); } else { sb1->setMass(node,0.f); |