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

2016-09-08 15:22:41 -07:00
parent 32eccdff61 e0127bdb54
commit 4ab02a07e5
5 changed files with 1507 additions and 1669 deletions
--- a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
+++ b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
@@ -1020,7 +1020,7 @@ int BulletURDFImporter::convertLinkVisualShapes(int linkIndex, const char* pathP
 	//delete textures
 	for (int i=0;i<textures.size();i++)
 	{
-		delete textures[i].textureData;
+		free( textures[i].textureData);
 	}
 	return graphicsIndex;
 }