From 001f2915ea24a030b9a6fb26a3ecbeedee6402bc Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 6 Nov 2023 16:15:52 -0600
Subject: [PATCH] SL-20570 Fix for lossy (and square) normal maps when
importing GLTF materials.
---
indra/newview/llmaterialeditor.cpp | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 7a65231a2db..5be1aa08abd 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1622,17 +1622,9 @@ static void pack_textures(
if (normal_img)
{
- normal_j2c = LLViewerTextureList::convertToUploadFile(normal_img);
-
- LLPointer<LLImageJ2C> test;
- test = LLViewerTextureList::convertToUploadFile(normal_img, 1024, true);
-
- S32 lossy_bytes = normal_j2c->getDataSize();
- S32 lossless_bytes = test->getDataSize();
-
- LL_DEBUGS("MaterialEditor") << llformat("Lossless vs Lossy: (%d/%d) = %.2f", lossless_bytes, lossy_bytes, (F32)lossless_bytes / lossy_bytes) << LL_ENDL;
-
- normal_j2c = test;
+ // create a losslessly compressed version of the normal map
+ normal_j2c = LLViewerTextureList::convertToUploadFile(normal_img, 1024, false, true);
+ LL_DEBUGS("MaterialEditor") << "Normal: " << normal_j2c->getDataSize() << LL_ENDL;
}
if (mr_img)
--
GitLab