summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llgltfmaterial.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-11-15 14:32:30 +0800
committerErik Kundiman <erik@megapahit.org>2023-11-15 14:32:30 +0800
commitd17cea8d53cd2bc253d30228f6d2e0abcd59701b (patch)
tree0d3e9669c07083b74e6a46693372db655dd67d79 /indra/llprimitive/llgltfmaterial.cpp
parent48af6d43580e07ea2b6833b6d44279bdd3f3e70d (diff)
parent843866d193a0fb5ea882408c8862335ab9c5539b (diff)
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.cpp')
-rw-r--r--indra/llprimitive/llgltfmaterial.cpp1
1 files changed, 1 insertions, 0 deletions
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"];