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

examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp

@@ -591,6 +591,7 @@ void LoadMeshFromCollada(const char* relativeFileName, btAlignedObjectArray<GLIn
 		if (actual==size)
 		{
 		}
+		fileIO->fileClose(fileHandle);
 	}
 	if (xmlString.size()==0)
 		return;

examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp

@@ -141,6 +141,7 @@ bool b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(const std::string&
 											buffer.resize(0);
 										}
 									}
+									fileIO->fileClose(fileId);
 								}
 
 								if (buffer.size())

examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h

@@ -1,4 +1,3 @@
-
 #ifndef LOAD_MESH_FROM_STL_H
 #define LOAD_MESH_FROM_STL_H
 
@@ -46,6 +45,7 @@ static GLInstanceGraphicsShape* LoadMeshFromSTL(const char* relativeFileName, st
 							if (expectedBinaryFileSize != size)
 							{
 								delete[] memoryBuffer;
+								fileIO->fileClose(fileHandle);
 								return 0;
 							}
 						}

examples/SharedMemory/PhysicsServerCommandProcessor.cpp

@@ -10244,6 +10244,7 @@ bool PhysicsServerCommandProcessor::processLoadTextureCommand(const struct Share
 								buffer.resize(0);
 							}
 						}
+						fileIO->fileClose(fileId);
 					}
 					if (buffer.size())
 					{

examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp

@@ -1361,6 +1361,7 @@ int EGLRendererVisualShapeConverter::loadTextureFile(const char* filename, struc
 					buffer.resize(0);
 				}
 			}
+			fileIO->fileClose(fileId);
 		}
 		if (buffer.size())
 		{

examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp

@@ -1270,6 +1270,7 @@ int TinyRendererVisualShapeConverter::loadTextureFile(const char* filename, stru
 					buffer.resize(0);
 				}
 			}
+			fileIO->fileClose(fileId);
 		}
 		if (buffer.size())
 		{

examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp

@@ -579,7 +579,7 @@ std::string LoadMtl(
 	// flush last material.
 	material_map.insert(std::pair<std::string, material_t>(material.name, material));
 
-	if (fileHandle)
+	if (fileHandle>=0)
 	{
 		fileIO->fileClose(fileHandle);
 	}
@@ -858,7 +858,7 @@ LoadObj(
 	}
 	faceGroup.resize(0);  // for safety
 
-	if (fileHandle)
+	if (fileHandle>=0)
 	{
 		fileIO->fileClose(fileHandle);
 	}