-From fbe930b81458cecfd7b5ed69859fe3e2329d1e56 Mon Sep 17 00:00:00 2001
+From 8957d854bee84942033647a09e13d7f3681f17aa Mon Sep 17 00:00:00 2001
 From: Robert Adams <Robert.Adams@intel.com>
-Date: Mon, 23 Jan 2012 08:09:55 -0800
+Date: Mon, 26 Mar 2012 11:05:02 -0700
 Subject: [PATCH] Call setWorldTransform when object is going inactive
 
 ---

 
 				}
-- 
1.7.5.1


 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index 954ef24..2767899 100755
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -640,6 +640,9 @@ void	btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
 					{
 						body->setAngularVelocity(btVector3(0,0,0));
 						body->setLinearVelocity(btVector3(0,0,0));
