diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-14 20:32:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-14 20:32:24 +0300 |
| commit | ec00764dd2349f723ba22b45515ec34ee81edcc3 (patch) | |
| tree | cf506e71af7172ec63b89aa3d284fab27a2085e6 /source/gameengine/Ketsji/KX_BulletPhysicsController.h | |
| parent | 131fa2e00c35ff78042a4f793891eaeb880d715c (diff) | |
| parent | 8449f0d77640c466acbda7d6ceeb71bc48317b44 (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD
Diffstat (limited to 'source/gameengine/Ketsji/KX_BulletPhysicsController.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BulletPhysicsController.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h index cdcb82c87ca..d5fca4ec6d3 100644 --- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h +++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h @@ -9,6 +9,7 @@ class KX_BulletPhysicsController : public KX_IPhysicsController ,public CcdPhysi { private: int m_savedCollisionFlags; + int m_savedActivationState; short int m_savedCollisionFilterGroup; short int m_savedCollisionFilterMask; MT_Scalar m_savedMass; |