diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-01-09 10:14:41 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-01-09 10:14:41 +0800 |
| commit | f6dec0bf7b9baa990fa26398e77faf5a410b8be6 (patch) | |
| tree | 9ed732e6801157018faff52d4782c2688fefdd73 /indra/llprimitive/lldaeloader.cpp | |
| parent | 0fd4a8b59677e1a85d19308379ab9967345749dc (diff) | |
| parent | 3c858d7e2d6633df14df473a918d2fb848403972 (diff) | |
Merge tag '7.1.2-release'
source for viewer 7.1.2.7215179142
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 3e29125fa1..b38bc30ea8 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -2592,7 +2592,8 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo next->mLabel = model_name + (char)((int)'a' + next->mSubmodelID) + lod_suffix[mLod]; next->getVolumeFaces() = remainder; next->mNormalizedScale = ret->mNormalizedScale; - + next->mNormalizedTranslation = ret->mNormalizedTranslation; + if ( ret->mMaterialList.size() > LL_SCULPT_MESH_MAX_FACES) { next->mMaterialList.assign(ret->mMaterialList.begin() + LL_SCULPT_MESH_MAX_FACES, ret->mMaterialList.end()); |