-fixes in player: draw physics debugging, only render frames when actually updated, fix with hierarchies not properly build (causing crashes)

1 files changed, 8 insertions, 2 deletions

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index d3eb4db6f35..ecb6c8d9dcf 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -368,8 +368,14 @@ void		CcdPhysicsController::setScaling(float scaleX,float scaleY,float scaleZ)
 		if (m_body && m_body->getCollisionShape())
 		{
 			m_body->getCollisionShape()->setLocalScaling(m_cci.m_scaling);
-			m_body->getCollisionShape()->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
-			m_body->setMassProps(m_cci.m_mass, m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
+			
+			//printf("no inertia recalc for fixed objects with mass=0\n");
+			if (m_cci.m_mass)
+			{
+				m_body->getCollisionShape()->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
+				m_body->setMassProps(m_cci.m_mass, m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
+			} 
+			
 		}
 	}
 }