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

2016-05-07 16:19:43 -07:00
parent 5151519b94 aae9e509a9
commit db4fb750bc
18 changed files with 247 additions and 53 deletions
--- a/examples/ExampleBrowser/OpenGLGuiHelper.cpp
+++ b/examples/ExampleBrowser/OpenGLGuiHelper.cpp
@@ -501,6 +501,7 @@ CommonParameterInterface* OpenGLGuiHelper::getParameterInterface()
 void OpenGLGuiHelper::setUpAxis(int axis)
 {
 	m_data->m_glApp->setUpAxis(axis);
+
 }

 void OpenGLGuiHelper::resetCamera(float camDist, float pitch, float yaw, float camPosX,float camPosY, float camPosZ)