diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-11-15 20:16:01 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-11-15 20:16:01 +0200 |
| commit | 4ae6f32ee16b21aed2235e96b99e18eebfdd82c6 (patch) | |
| tree | 212e54201405225784a3e23c5ee847f0e688ac24 /indra/llprimitive/lldaeloader.cpp | |
| parent | 2e52d12ef1ecc53f1affdf7b6d2150e9256eee65 (diff) | |
MAINT-6901 Fixes upload assigning different scale to parts of the model
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 031befe63a..de02c5c188 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -999,6 +999,11 @@ bool LLDAELoader::OpenFile(const std::string& filename) std::sort(mModelList.begin(), mModelList.end(), ModelSort()); + if (!mNoNormalize) + { + LLModel::normalizeModels(mModelList); + } + model_list::iterator model_iter = mModelList.begin(); while (model_iter != mModelList.end()) { @@ -2408,8 +2413,6 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo // ret->sortVolumeFacesByMaterialName(); - bool normalized = false; - int submodelID = 0; // remove all faces that definitely won't fit into one model and submodel limit @@ -2424,12 +2427,6 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo { // Insure we do this once with the whole gang and not per-model // - if (!normalized && !mNoNormalize) - { - normalized = true; - ret->normalizeVolumeFaces(); - } - ret->trimVolumeFacesToSize(LL_SCULPT_MESH_MAX_FACES, &remainder); if (!mNoOptimize) |