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

MAINT-4882 FIXED Mesh complex model upload with .slm uses different default model name

meow-7.2.2
andreykproductengine 2015-02-13 16:07:59 +02:00
parent 9d0d5d7e6f
commit 401eed50de
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llprimitive/llmodelloader.cpp
View File

@ -413,12 +413,11 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
instance_list[i].mModel = model[LLModel::LOD_HIGH][idx];
}
// Set name.
// Set name for UI to use
std::string name = data["name"];
if (!name.empty() && model[LLModel::LOD_HIGH][0]->mLabel.empty())
if (!name.empty())
{
// fall back value, should be reset later by names from instances
model[LLModel::LOD_HIGH][0]->mLabel = name;
model[LLModel::LOD_HIGH][0]->mRequestedLabel = name;
}