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

2013-03-22 16:27:13 -07:00
parent 07001d9861 8a6d71ad42
commit 11d934b63a
5 changed files with 88288 additions and 11 deletions
--- a/demo/gpudemo/main_opengl3core.cpp
+++ b/demo/gpudemo/main_opengl3core.cpp
@@ -64,9 +64,10 @@ btAlignedObjectArray<const char*> demoNames;
 int selectedDemo = 0;
 GpuDemo::CreateFunc* allDemos[]=
 {
+		ConcaveScene::MyCreateFunc,
+
 	GpuConvexScene::MyCreateFunc,
 	GpuCompoundScene::MyCreateFunc,
-	ConcaveScene::MyCreateFunc,
 	GpuConvexScene::MyCreateFunc,

 	GpuRigidBodyDemo::MyCreateFunc,