Browse Source

Fixed bug in merging of materials

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

+ 1 - 1
code/SceneCombiner.cpp

@@ -916,7 +916,7 @@ void SceneCombiner::MergeMaterials(aiMaterial** dest,
 			const aiMaterialProperty* prop_exist;
 			if(aiGetMaterialProperty(out, sprop->mKey.C_Str(), sprop->mType, sprop->mIndex, &prop_exist) != AI_SUCCESS) {
 				// If not, we add it to the new material
-				aiMaterialProperty* prop = out->mProperties[i] = new aiMaterialProperty();
+				aiMaterialProperty* prop = out->mProperties[out->mNumProperties] = new aiMaterialProperty();
 
 				prop->mDataLength = sprop->mDataLength;
 				prop->mData = new char[prop->mDataLength];