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

MAINT-5216 FIXED Error appears when trying to upload the model "instance test.dae"

meow-7.2.2
andreykproductengine 2015-05-14 19:11:53 +03:00
parent 4f236dd7e8
commit 9e2eca1a8c
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/llprimitive/lldaeloader.cpp
View File

@ -1931,16 +1931,34 @@ void LLDAELoader::processElement( daeElement* element, bool& badElement, DAE* da
badElement = true;
}
std::string label = getLodlessLabel(instance_geo);
llassert(!label.empty());
if (model->mSubmodelID)
std::string label;
if (model->mLabel.empty())
{
label +=(char)((int)'a' + model->mSubmodelID);
}
label = getLodlessLabel(instance_geo);
model->mLabel = label + lod_suffix[mLod];
llassert(!label.empty());
if (model->mSubmodelID)
{
label += (char)((int)'a' + model->mSubmodelID);
}
model->mLabel = label + lod_suffix[mLod];
}
else
{
// Don't change model's name if possible, it will play havoc with scenes that already use said model.
size_t ext_pos = getSuffixPosition(model->mLabel);
if (ext_pos != -1)
{
label = model->mLabel.substr(0, ext_pos);
}
else
{
label = model->mLabel;
}
}
mScene[transformation].push_back(LLModelInstance(model, label, transformation, materials));
stretch_extents(model, transformation, mExtents[0], mExtents[1], mFirstTransform);