Merge branch 'master' of https://github.com/erwincoumans/bullet3

2017-05-16 13:55:29 -07:00
parent 59ece491bd 433d11d8cf
commit 2f57c259fd
26 changed files with 437 additions and 116 deletions
--- a/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
+++ b/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
@@ -798,6 +798,8 @@ void	btMultiBodyDynamicsWorld::debugDrawWorld()
 {
 	BT_PROFILE("btMultiBodyDynamicsWorld debugDrawWorld");

+	btDiscreteDynamicsWorld::debugDrawWorld();
+
 	bool drawConstraints = false;
 	if (getDebugDrawer())
 	{
@@ -867,7 +869,7 @@ void	btMultiBodyDynamicsWorld::debugDrawWorld()
 		}
 	}

-	btDiscreteDynamicsWorld::debugDrawWorld();
+	
 }