Browse Source

Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...)

Léo Terziman 10 years ago
parent
commit
c99bd9825a
1 changed files with 1 additions and 1 deletions
  1. 1 1
      code/SceneCombiner.cpp

+ 1 - 1
code/SceneCombiner.cpp

@@ -920,7 +920,7 @@ void SceneCombiner::MergeMaterials(aiMaterial** dest,
 
 
 			// Test if we already have a matching property 
 			// Test if we already have a matching property 
 			const aiMaterialProperty* prop_exist;
 			const aiMaterialProperty* prop_exist;
-			if(aiGetMaterialProperty(out, sprop->mKey.C_Str(), sprop->mType, sprop->mIndex, &prop_exist) != AI_SUCCESS) {
+			if(aiGetMaterialProperty(out, sprop->mKey.C_Str(), sprop->mSemantic, sprop->mIndex, &prop_exist) != AI_SUCCESS) {
 				// If not, we add it to the new material
 				// If not, we add it to the new material
 				aiMaterialProperty* prop = out->mProperties[out->mNumProperties] = new aiMaterialProperty();
 				aiMaterialProperty* prop = out->mProperties[out->mNumProperties] = new aiMaterialProperty();