From 8d98804ba4f58dc7fef850ee7534af6e216b1d9c Mon Sep 17 00:00:00 2001 From: Ptolemy Date: Fri, 17 Dec 2021 13:12:41 -0800 Subject: SL-16492: Fix for HAS_ALPHA_MASK permutation not being set for fullbrightF.glsl when rigged mesh has alpha mask. --- indra/newview/llviewershadermgr.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 829e7f8add..c97b1d914b 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -264,10 +264,12 @@ bool make_rigged_variant(LLGLSLShader& shader, LLGLSLShader& riggedShader) riggedShader.mName = llformat("Skinned %s", shader.mName.c_str()); riggedShader.mFeatures = shader.mFeatures; riggedShader.mFeatures.hasObjectSkinning = true; + riggedShader.mDefines = shader.mDefines; // NOTE: Must come before addPermutation riggedShader.addPermutation("HAS_SKIN", "1"); riggedShader.mShaderFiles = shader.mShaderFiles; riggedShader.mShaderLevel = shader.mShaderLevel; riggedShader.mShaderGroup = shader.mShaderGroup; + shader.mRiggedVariant = &riggedShader; return riggedShader.createShader(NULL, NULL); } -- cgit v1.2.3