[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56369] trunk/blender/extern/bullet2/src/ BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp: bullet: Fix avoiding collision response between static/kinematic objects

[Sergej Reich]

Revision: 56369
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56369
Author:   sergof
Date:     2013-04-28 21:40:54 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp

Modified: trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp	2013-04-28 20:51:44 UTC (rev 56368)
+++ trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp	2013-04-28 21:40:54 UTC (rev 56369)
@@ -766,7 +766,7 @@
 
 
 	///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;