[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11181] trunk/blender/extern/bullet2/src/ BulletDynamics/Dynamics/btRigidBody.cpp: fixed issue with kinematic objects

[Erwin Coumans]

Revision: 11181
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11181
Author:   erwin
Date:     2007-07-06 06:30:25 +0200 (Fri, 06 Jul 2007)

Log Message:
-----------
fixed issue with kinematic objects

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp

Modified: trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp	2007-07-06 04:12:07 UTC (rev 11180)
+++ trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp	2007-07-06 04:30:25 UTC (rev 11181)
@@ -113,7 +113,7 @@
 
 
 
-#define EXPERIMENTAL_JITTER_REMOVAL 1
+//#define EXPERIMENTAL_JITTER_REMOVAL 1
 #ifdef EXPERIMENTAL_JITTER_REMOVAL
 //Bullet 2.20b has experimental damping code to reduce jitter just before objects fall asleep/deactivate
 //doesn't work very well yet (value 0 disabled this damping)
@@ -298,7 +298,14 @@
 	
 void btRigidBody::setCenterOfMassTransform(const btTransform& xform)
 {
-	m_interpolationWorldTransform = xform;//m_worldTransform;
+
+	if (isStaticOrKinematicObject())
+	{
+		m_interpolationWorldTransform = m_worldTransform;
+	} else
+	{
+		m_interpolationWorldTransform = xform;
+	}
 	m_interpolationLinearVelocity = getLinearVelocity();
 	m_interpolationAngularVelocity = getAngularVelocity();
 	m_worldTransform = xform;