v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in merging of materials

pull/261/head
Léo Terziman 2014-02-10 15:11:13 +01:00
parent 505a8d42aa
commit 9b25749536
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/SceneCombiner.cpp
View File

@ -916,7 +916,7 @@ void SceneCombiner::MergeMaterials(aiMaterial** dest,
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->mType, 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[i] = new aiMaterialProperty(); aiMaterialProperty* prop = out->mProperties[out->mNumProperties] = new aiMaterialProperty();
prop->mDataLength = sprop->mDataLength; prop->mDataLength = sprop->mDataLength;
prop->mData = new char[prop->mDataLength]; prop->mData = new char[prop->mDataLength];