kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bullet: Fix avoiding collision response between static/kinematic objects

Browse Source 
Sent patch upstream.

Fixes [#35115] Character physics type fails collision with static type with an action on 2.67 rc
This commit is contained in:
Sergej Reich 2013-04-28 21:40:54 +00:00
parent 6b170dcfd7
commit c80ff61d40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp vendored
View File

@ -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;