Merge branch 'master' of https://bitbucket.org/erwincoumans/bullet3_experiments

Conflicts: btgui/OpenGLWindow/GLInstancingRenderer.cpp
2013-04-03 09:24:21 -07:00
parent c2eb058e1f 5c8c8e1cbb
commit 8cee2e9b23
36 changed files with 7151 additions and 332 deletions
--- a/btgui/OpenGLWindow/GLInstancingRenderer.cpp
+++ b/btgui/OpenGLWindow/GLInstancingRenderer.cpp
@@ -209,7 +209,6 @@ void btDefaultMouseMoveCallback( float x, float y)

 void btDefaultKeyboardCallback(int key, int state)
 {
-	//printf("world2\n");
 }