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

2016-07-25 11:49:56 -07:00
parent a6216f4f24 53fa57bdc4
commit 6b0ceace7f
29 changed files with 9710 additions and 29 deletions
--- a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
+++ b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
@@ -802,6 +802,7 @@ bool OpenGLExampleBrowser::init(int argc, char* argv[])
        s_app = new SimpleOpenGL2App(title,width,height);
        s_app->m_renderer = new SimpleOpenGL2Renderer(width,height);
    } 
+
 #ifndef NO_OPENGL3
 	else
    {