livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4533 FIXED viewer crash when uploading shiprigging88b.dae

Mnikolenko ProductEngine 2014-10-20 11:11:45 +03:00
parent 7e4ec481ae
commit 79212e759b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llprimitive/llmodel.cpp
View File

@ -128,10 +128,14 @@ void LLModel::sortVolumeFacesByMaterialName()
{
std::vector<MaterialBinding> bindings;
bindings.resize(mVolumeFaces.size());
for (int i = 0; i < bindings.size(); i++)
{
bindings[i].index = i;
bindings[i].matName = mMaterialList[i];
if(i < mMaterialList.size())
{
bindings[i].matName = mMaterialList[i];
}
}
std::sort(bindings.begin(), bindings.end(), MaterialSort());
std::vector< LLVolumeFace > new_faces;
@ -142,7 +146,10 @@ void LLModel::sortVolumeFacesByMaterialName()
for (int i = 0; i < bindings.size(); i++)
{
new_faces[i] = mVolumeFaces[bindings[i].index];
mMaterialList[i] = bindings[i].matName;
if(i < mMaterialList.size())
{
mMaterialList[i] = bindings[i].matName;
}
}
mVolumeFaces = new_faces;