Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/bullet/BulletDynamics/Dynamics/RigidBody.h')
-rw-r--r--extern/bullet/BulletDynamics/Dynamics/RigidBody.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/extern/bullet/BulletDynamics/Dynamics/RigidBody.h b/extern/bullet/BulletDynamics/Dynamics/RigidBody.h
index 4a61be786ca..4ff987f6eaa 100644
--- a/extern/bullet/BulletDynamics/Dynamics/RigidBody.h
+++ b/extern/bullet/BulletDynamics/Dynamics/RigidBody.h
@@ -9,6 +9,9 @@ class CollisionShape;
struct MassProps;
typedef SimdScalar dMatrix3[4*3];
+extern float gLinearAirDamping;
+extern bool gUseEpa;
+
/// RigidBody class for RigidBody Dynamics
///
@@ -170,7 +173,10 @@ public:
dMatrix3 m_invI;
int m_islandTag1;//temp
int m_activationState1;//temp
+ float m_deactivationTime;
+
int m_odeTag;
+ float m_padding[1024];
SimdVector3 m_tacc;//temp
SimdVector3 m_facc;
SimdScalar m_hitFraction; //time of impact calculation