diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-07-23 16:04:32 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 16:04:32 -0300 |
| commit | dc976cac57bc04de6cdace8d582a48f07afa0a7b (patch) | |
| tree | edcabc27a46b50ce492f02fc99ee96b37d32f667 /modules/bullet/collision_object_bullet.cpp | |
| parent | ec85fd554b0ae9861fddabbda1667a93bdd52450 (diff) | |
| parent | 17ebbfb56de980c5529c8a02a12141dd7bb766c8 (diff) | |
Merge pull request #12678 from AndreaCatania/soft
Soft body
Diffstat (limited to 'modules/bullet/collision_object_bullet.cpp')
| -rw-r--r-- | modules/bullet/collision_object_bullet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp index 57e4db708e..1d63318fd7 100644 --- a/modules/bullet/collision_object_bullet.cpp +++ b/modules/bullet/collision_object_bullet.cpp @@ -111,6 +111,8 @@ void CollisionObjectBullet::setupBulletCollisionObject(btCollisionObject *p_coll void CollisionObjectBullet::add_collision_exception(const CollisionObjectBullet *p_ignoreCollisionObject) { exceptions.insert(p_ignoreCollisionObject->get_self()); + if (!bt_collision_object) + return; bt_collision_object->setIgnoreCollisionCheck(p_ignoreCollisionObject->bt_collision_object, true); if (space) space->get_broadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bt_collision_object->getBroadphaseHandle(), space->get_dispatcher()); |