svn merge -r 16351:16368 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / gameengine / Physics / Bullet / CcdPhysicsController.cpp
index 8fd89295b03258b619a453f7a9e0e873e748d40a..b67cf0425c5f9cce2358659ea88450a3e0995221 100644 (file)
@@ -126,13 +126,14 @@ void CcdPhysicsController::CreateRigidbody()
 
        m_bulletMotionState = new BlenderBulletMotionState(m_MotionState);
 
-       m_body = new btRigidBody(m_cci.m_mass,
-               m_bulletMotionState,
-               m_collisionShape,
-               m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor,
-               m_cci.m_linearDamping,m_cci.m_angularDamping,
-               m_cci.m_friction,m_cci.m_restitution);
-
+       btRigidBody::btRigidBodyConstructionInfo rbci(m_cci.m_mass,m_bulletMotionState,m_collisionShape,m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
+       rbci.m_linearDamping = m_cci.m_linearDamping;
+       rbci.m_angularDamping = m_cci.m_angularDamping;
+       rbci.m_friction = m_cci.m_friction;
+       rbci.m_restitution = m_cci.m_restitution;
+       
+       m_body = new btRigidBody(rbci);
+       
        //
        // init the rigidbody properly
        //