From e49d602bd99f5a3b1257ba1bc7ded133eab1eb1c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 12 Sep 2022 19:48:33 -0500
Subject: SL-18095 Add tangents to mesh assets so we can calculate mikktspace
 tangents in the mesh's original coordinate frame.

---
 indra/llprimitive/lldaeloader.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'indra/llprimitive/lldaeloader.cpp')

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 50f4a4306e..9470146ce4 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -2551,6 +2551,9 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo
 	LLVolume::face_list_t remainder;
 	do 
 	{
+        // generate tangents and cache optimize before normalizing
+        ret->preprocessVolumeFaces();
+
 		// Insure we do this once with the whole gang and not per-model
 		//
 		if (!normalized && !mNoNormalize)
@@ -2561,10 +2564,11 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo
 
 		ret->trimVolumeFacesToSize(LL_SCULPT_MESH_MAX_FACES, &remainder);
 
-		if (!mNoOptimize)
-		{
-			ret->remapVolumeFaces();
-		}
+        // remove unused/redundant vertices after normalizing
+		//if (!mNoOptimize)
+		//{
+		//	ret->remapVolumeFaces();
+		//}
 
 		volume_faces = remainder.size();
 
-- 
cgit v1.2.3