diff options
Diffstat (limited to 'extern/bullet2/patches/ghost_character.patch')
| -rw-r--r-- | extern/bullet2/patches/ghost_character.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/extern/bullet2/patches/ghost_character.patch b/extern/bullet2/patches/ghost_character.patch deleted file mode 100644 index d4098cb8bc2..00000000000 --- a/extern/bullet2/patches/ghost_character.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp -=================================================================== ---- extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp (revision 49183) -+++ extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp (working copy) -@@ -77,6 +77,9 @@ - if (convexResult.m_hitCollisionObject == m_me) - return btScalar(1.0); - -+ if (!convexResult.m_hitCollisionObject->hasContactResponse()) -+ return btScalar(1.0); -+ - btVector3 hitNormalWorld; - if (normalInWorldSpace) - { -@@ -173,7 +176,12 @@ - m_manifoldArray.resize(0); - - btBroadphasePair* collisionPair = &m_ghostObject->getOverlappingPairCache()->getOverlappingPairArray()[i]; -- -+ btCollisionObject* obj0 = static_cast<btCollisionObject*>(collisionPair->m_pProxy0->m_clientObject); -+ btCollisionObject* obj1 = static_cast<btCollisionObject*>(collisionPair->m_pProxy1->m_clientObject); -+ -+ if ((obj0 && !obj0->hasContactResponse()) || (obj1 && !obj1->hasContactResponse())) -+ continue; -+ - if (collisionPair->m_algorithm) - collisionPair->m_algorithm->getAllContactManifolds(m_manifoldArray); - |