diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2009-03-09 07:21:28 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2009-03-09 07:21:28 +0300 |
| commit | abb338ddf9dea9a26ca1092b3f7fda86b32bbd16 (patch) | |
| tree | 215d6b18fccc2705c4b2566f0dba3b11433bc6d5 /extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h | |
| parent | e4ce0d629e021bcc1b910a1f49c251a17501cff6 (diff) | |
upgrade to latest Bullet trunk, fix related to vehicle anti-roll, added constraint visualization.
This commit doesn't add new functionality, but more updates are planned before Blender 2.49 release.
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h index 98c9876ae46..6b728959162 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h @@ -110,8 +110,8 @@ ATTRIBUTE_ALIGNED16 (struct) btSolverBody BT_DECLARE_ALIGNED_ALLOCATOR(); btVector3 m_deltaLinearVelocity; btVector3 m_deltaAngularVelocity; - btScalar m_angularFactor; - btScalar m_invMass; + btVector3 m_angularFactor; + btVector3 m_invMass; btScalar m_friction; btRigidBody* m_originalBody; btVector3 m_pushVelocity; @@ -162,7 +162,7 @@ ATTRIBUTE_ALIGNED16 (struct) btSolverBody void writebackVelocity(btScalar timeStep=0) { - if (m_invMass) + if (m_originalBody) { m_originalBody->setLinearVelocity(m_originalBody->getLinearVelocity()+m_deltaLinearVelocity); m_originalBody->setAngularVelocity(m_originalBody->getAngularVelocity()+m_deltaAngularVelocity); |