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

2017-06-08 14:28:42 -07:00
parent b325844b9a c1f6b7e9b8
commit 7ee8126d66
1 changed files with 1 additions and 1 deletions
--- a/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
+++ b/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
@@ -36,7 +36,7 @@ bool b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(const std::string&
 		
 		//int textureIndex = -1;
 		//try to load some texture
-		for (int i=0;i<shapes.size();i++)
+		for (int i=0; meshData.m_textureImage==0  && i<shapes.size();i++)
 		{
 			const tinyobj::shape_t& shape = shapes[i];
 			if (shape.material.diffuse_texname.length()>0)