diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2007-06-23 09:28:07 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2007-06-23 09:28:07 +0400 |
commit | ca26aeb7b23e37e65f49d907ea53fcaeee77ad4e (patch) | |
tree | b6530195a8ef5d874b9fc2bbb9574f1484781be5 /extern/bullet2/src/LinearMath/btMotionState.h | |
parent | 14ad8c9941ac1e6f5252a843c6ad17653cbbd689 (diff) |
upgrade to latest Bullet 2.53. cross the fingers it doesn't break one of the exotic or less exotic platforms
Diffstat (limited to 'extern/bullet2/src/LinearMath/btMotionState.h')
-rw-r--r-- | extern/bullet2/src/LinearMath/btMotionState.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/extern/bullet2/src/LinearMath/btMotionState.h b/extern/bullet2/src/LinearMath/btMotionState.h index a9e212d3c71..1975e5ff900 100644 --- a/extern/bullet2/src/LinearMath/btMotionState.h +++ b/extern/bullet2/src/LinearMath/btMotionState.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef BT_MOTIONSTATE_H #define BT_MOTIONSTATE_H -#include "LinearMath/btTransform.h" +#include "btTransform.h" ///btMotionState allows the dynamics world to synchronize the updated world transforms with graphics ///For optimizations, potentially only moving objects get synchronized (using setWorldPosition/setWorldOrientation) @@ -34,10 +34,7 @@ class btMotionState //Bullet only calls the update of worldtransform for active objects virtual void setWorldTransform(const btTransform& worldTrans)=0; - //future: when Bullet makes attempt to deactivate object, you can intercept this callback (return false to disable deactivation for this object this frame) - virtual bool deactivationCallback(void* userPointer) { - return true; - } + }; #endif //BT_MOTIONSTATE_H |