Merge pull request #1126 from erwincoumans/master

allow to enable/disable VR picking and VR teleport. Disabling VR pick…

src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp

@@ -1514,6 +1514,8 @@ void	btCollisionWorld::debugDrawWorld()
 {
 	if (getDebugDrawer())
 	{
+		getDebugDrawer()->clearLines();
+
 		btIDebugDraw::DefaultColors defaultColors = getDebugDrawer()->getDefaultColors();
 
 		if ( getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints)

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();
+	
 }
 
 

src/LinearMath/btIDebugDraw.h

@@ -469,6 +469,10 @@ class	btIDebugDraw
 		drawLine(transform*pt2,transform*pt3,color);
 	}
 
+	virtual void clearLines()
+	{
+	}
+
 	virtual void flushLines()
 	{
 	}