Merge from trunk

svn merge -r 14626:14692 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-05-05 17:30:33 +00:00
parent 2b5432e6bb
commit 0b7ab2f8ec
96 changed files with 1656 additions and 1160 deletions
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -137,6 +137,10 @@ void CcdPhysicsController::CreateRigidbody()
 	m_body->setGravity( m_cci.m_gravity);
 	m_body->setDamping(m_cci.m_linearDamping, m_cci.m_angularDamping);

+	if (!m_cci.m_bRigid)
+	{
+		m_body->setAngularFactor(0.f);
+	}
 }

 CcdPhysicsController::~CcdPhysicsController()