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 /extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp | |
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 'extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp')
-rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp index 835a03b8e3c..e5feb5ef749 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp +++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp @@ -59,7 +59,10 @@ void btSoftRigidCollisionAlgorithm::processCollision (btCollisionObject* body0,b btSoftBody* softBody = m_isSwapped? (btSoftBody*)body1 : (btSoftBody*)body0; btCollisionObject* rigidCollisionObject = m_isSwapped? body0 : body1; - softBody->defaultCollisionHandler(rigidCollisionObject); + if (softBody->m_collisionDisabledObjects.findLinearSearch(rigidCollisionObject)==softBody->m_collisionDisabledObjects.size()) + { + softBody->defaultCollisionHandler(rigidCollisionObject); + } } |