diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 14:56:02 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 14:56:02 +0300 |
| commit | 318b98fc9a8fe31a6b71c6e71eb0f486fd59b25a (patch) | |
| tree | 914a6f2ee65b593af1b7e075ddb8cbefdd55c916 /extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h | |
| parent | 057a6e336093c48d92e48ea1f47ea6536be291ef (diff) | |
some fixes, related to object activation in game blender
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h index b85534c1d15..9a0129ac29c 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -148,7 +148,7 @@ public: void forceActivationState(int newState); - void activate(); + void activate(bool forceActivation = false); inline bool isActive() const { |