updating Bullet 2.x with latest changes. The integration + C-API will follow at some stage.

1 files changed, 10 insertions, 1 deletions

diff --git a/extern/bullet2/src/LinearMath/btDefaultMotionState.h b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
index 805631ac56f..6b85b37fb9e 100644
--- a/extern/bullet2/src/LinearMath/btDefaultMotionState.h
+++ b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
@@ -19,16 +19,25 @@ struct	btDefaultMotionState : public btMotionState
 	}
 
 	///synchronizes world transform from user to physics
-	virtual void	getWorldTransform(btTransform& centerOfMassWorldTrans )
+	virtual void	getWorldTransform(btTransform& centerOfMassWorldTrans ) const 
 	{
 			centerOfMassWorldTrans = 	m_centerOfMassOffset.inverse() * m_graphicsWorldTrans ;
 	}
 
 	///synchronizes world transform from physics to user
+	///Bullet only calls the update of worldtransform for active objects
 	virtual void	setWorldTransform(const btTransform& centerOfMassWorldTrans)
 	{
 			m_graphicsWorldTrans = centerOfMassWorldTrans * m_centerOfMassOffset ;
 	}
+
+	///Bullet gives a callback for objects that are about to be deactivated (put asleep)
+	/// You can intercept this callback for your own bookkeeping. 
+	///Also you can return false to disable deactivation for this object this frame.
+	virtual bool deactivationCallback(void*	userPointer) {
+		return true;
+	}
+
 };
 
 #endif //DEFAULT_MOTION_STATE_H