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

btgui/OpenGLWindow/SimpleOpenGL3App.cpp

@@ -210,8 +210,7 @@ void SimpleOpenGL3App::drawText( const char* txt, int posX, int posY)
 
 	glDisable(GL_BLEND);
 }
-int	SimpleOpenGL3App::registerCubeShape(float halfExtentsX,float halfExtentsY, float halfExtentsZ)
-{
+
 struct GfxVertex
 	{
 		float x,y,z,w;
@@ -219,6 +218,10 @@ int	SimpleOpenGL3App::registerCubeShape(float halfExtentsX,float halfExtentsY, f
 		float u,v;
 	};
 
+int	SimpleOpenGL3App::registerCubeShape(float halfExtentsX,float halfExtentsY, float halfExtentsZ)
+{
+
+
 	int strideInBytes = 9*sizeof(float);
 	int numVertices = sizeof(cube_vertices)/strideInBytes;
 	int numIndices = sizeof(cube_indices)/sizeof(int);