From 7414f71880b3ecda58a66233aeade8325535cae0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Dec 2021 22:58:27 +0200
Subject: SL-16471 Removed unneeded MeshOpt generation method

---
 indra/newview/llfloatermodelpreview.cpp                  |  2 --
 indra/newview/llmodelpreview.cpp                         |  9 ---------
 indra/newview/llmodelpreview.h                           |  5 ++---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ----------------
 4 files changed, 2 insertions(+), 30 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index de89d776df..729b10ce97 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -727,7 +727,6 @@ void LLFloaterModelPreview::onLODParamCommit(S32 lod, bool enforce_tri_limit)
     switch (mode)
     {
     case LLModelPreview::MESH_OPTIMIZER_AUTO:
-    case LLModelPreview::MESH_OPTIMIZER:
     case LLModelPreview::MESH_OPTIMIZER_SLOPPY:
     case LLModelPreview::MESH_OPTIMIZER_COMBINE:
         mModelPreview->onLODMeshOptimizerParamCommit(lod, enforce_tri_limit, mode);
@@ -1736,7 +1735,6 @@ void LLFloaterModelPreview::onLoDSourceCommit(S32 lod)
 	LLComboBox* lod_source_combo = getChild<LLComboBox>("lod_source_" + lod_name[lod]);
     S32 index = lod_source_combo->getCurrentIndex();
 	if (index == LLModelPreview::MESH_OPTIMIZER_AUTO
-        || index == LLModelPreview::MESH_OPTIMIZER
         || index == LLModelPreview::MESH_OPTIMIZER_SLOPPY
         || index == LLModelPreview::MESH_OPTIMIZER_COMBINE)
 	{ //rebuild LoD to update triangle counts
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 6a827207ae..4c20f941ce 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -1754,15 +1754,6 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d
                     }
                 }
             }
-            
-            if (model_meshopt_mode == MESH_OPTIMIZER)
-            {
-                // Run meshoptimizer for each face
-                for (U32 face_idx = 0; face_idx < base->getNumVolumeFaces(); ++face_idx)
-                {
-                    genMeshOptimizerPerFace(base, target_model, face_idx, indices_decimator, lod_error_threshold, false);
-                }
-            }
 
             if (model_meshopt_mode == MESH_OPTIMIZER_SLOPPY)
             {
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h
index 7d4507ccf2..9361acfc49 100644
--- a/indra/newview/llmodelpreview.h
+++ b/indra/newview/llmodelpreview.h
@@ -125,9 +125,8 @@ public:
     {
         LOD_FROM_FILE = 0,
         MESH_OPTIMIZER_AUTO, // automatically selects method based on model or face
-        MESH_OPTIMIZER_COMBINE,
-        MESH_OPTIMIZER,
-        MESH_OPTIMIZER_SLOPPY,
+        MESH_OPTIMIZER_COMBINE, // combines faces into a single model, simplifies, then splits back into faces
+        MESH_OPTIMIZER_SLOPPY, // uses sloppy method, works per face
         USE_LOD_ABOVE,
     } eLoDMode;
 
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index d08bc92e5d..f10cc61826 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -194,10 +194,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
@@ -335,10 +331,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
@@ -480,10 +472,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
@@ -625,10 +613,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
-- 
cgit v1.2.3