From 843866d193a0fb5ea882408c8862335ab9c5539b Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 13 Nov 2023 13:12:48 -0600
Subject: Drtvwr 596 11/8/2023 (#501)

* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials.

* SL-20582 Fix for overriding to alpha mode blend not working.  Incidental decruft of dead code (thanks, Rye!)
---
 indra/llprimitive/llgltfmaterial.cpp | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index d2c911a189..ae165f7fa4 100644
--- a/indra/llprimitive/llgltfmaterial.cpp
+++ b/indra/llprimitive/llgltfmaterial.cpp
@@ -723,6 +723,7 @@ void LLGLTFMaterial::applyOverrideLLSD(const LLSD& data)
     if (am.isInteger())
     {
         mAlphaMode = (AlphaMode) am.asInteger();
+        mOverrideAlphaMode = true;
     }
 
     const LLSD& ac = data["ac"];
-- 
cgit v1.2.3