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

2013-05-23 19:15:28 -07:00
parent 3a7f821a76 084bc4ec32
commit c8b979e7ef
38 changed files with 3222 additions and 176 deletions
--- a/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp
+++ b/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp
@@ -173,14 +173,16 @@ void ConcaveScene::createConcaveMesh(const ConstructionInfo& ci, const char* fil
 			f = fopen(relativeFileName,"r");
 			if (f)
 			{
-				fclose(f);
 				break;
 			}
 		}
 	}

 	if (f)
+	{
 		fclose(f);
+		f=0;
+	}
 	else
 		return;