diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-04-29 01:40:54 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-04-29 01:40:54 +0400 |
| commit | c80ff61d40421f931b2ee219a1b1f8c0cbcf694d (patch) | |
| tree | a260e86f21f0c6f13804aeee8d225d009e8b71d3 /extern/bullet2 | |
| parent | 6b170dcfd70a32684f3c6b15e54d15f0c5ff6316 (diff) | |
bullet: Fix avoiding collision response between static/kinematic objects
Sent patch upstream.
Fixes [#35115] Character physics type fails collision with static type with an action on 2.67 rc
Diffstat (limited to 'extern/bullet2')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp index 0ccadea7ab8..5f9437b7add 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp @@ -766,7 +766,7 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m ///avoid collision response between two static objects - if (!solverBodyA || (!solverBodyA->m_originalBody && (!solverBodyB || !solverBodyB->m_originalBody))) + if (!solverBodyA || (solverBodyA->m_invMass.isZero() && (!solverBodyB || solverBodyB->m_invMass.isZero()))) return; int rollingFriction=1; |