diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-03-27 03:25:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-03-27 03:32:28 +0300 |
| commit | e14324daa72f21405b697d87c6d2d780873167b3 (patch) | |
| tree | b15d8f49ed31d0410cf39beeec1c21f519c81ae6 /extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h | |
| parent | 273740006e19f19b702d8a0a5cfa1d5dc41eb1c8 (diff) | |
Fix T47758: rigidbody bug with constraint breaking and disable collisions.
This is a regression in Bullet, reverted the problematic change for now with
a custom patch.
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h index 1d177db802a..c2f8c5d64ae 100644 --- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h +++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h @@ -509,6 +509,8 @@ public: return (getBroadphaseProxy() != 0); } + virtual bool checkCollideWithOverride(const btCollisionObject* co) const; + void addConstraintRef(btTypedConstraint* c); void removeConstraintRef(btTypedConstraint* c); |