diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-12-17 21:26:21 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-12-17 21:26:21 +0000 |
| commit | eb40fcadccb9e47618f1ff071a33cbf11d1cd9e4 (patch) | |
| tree | 02162b5ea5d3b0f3f70064137687989df280ce9b /indra/newview | |
| parent | f22d659c6f2d9d99749be532730c09d283598e2e (diff) | |
| parent | 8d98804ba4f58dc7fef850ee7534af6e216b1d9c (diff) | |
Merged in SL-16492 (pull request #818)
SL-16492: Fix for HAS_ALPHA_MASK permutation not being set for fullbrightF.glsl when rigged mesh has alpha mask.
Approved-by: Dave Parks
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |