diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-02 11:20:09 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-02 11:20:09 -0700 |
| commit | 7e5000bb64ca8eea3fe188ebb7bccff3bdfa82e7 (patch) | |
| tree | 7350df57d466b4b9fc4ad2fe10e8d590207c1841 /indra/newview/llviewershadermgr.cpp | |
| parent | 576f1cdd7e16e44c43b39618f715753160045468 (diff) | |
SL-11533
Make alpha shader include vertex color modulation in both srgb and linear flavors.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 55973aac2c..bd8064999f 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1483,7 +1483,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredSkinnedAlphaProgram.clearPermutations(); gDeferredSkinnedAlphaProgram.addPermutation("USE_DIFFUSE_TEX", "1"); gDeferredSkinnedAlphaProgram.addPermutation("HAS_SKIN", "1"); - gDeferredSkinnedAlphaProgram.addPermutation("USE_VERTEX_COLOR", "1"); + if (use_sun_shadow) { gDeferredSkinnedAlphaProgram.addPermutation("HAS_SHADOW", "1"); @@ -1955,7 +1955,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() { gDeferredAlphaProgram.addPermutation("HAS_SHADOW", "1"); } - gDeferredAlphaProgram.addPermutation("USE_VERTEX_COLOR", "1"); if (ambient_kill) { @@ -2010,7 +2009,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredAlphaImpostorProgram.clearPermutations(); gDeferredAlphaImpostorProgram.addPermutation("USE_INDEXED_TEX", "1"); - gDeferredAlphaImpostorProgram.addPermutation("USE_VERTEX_COLOR", "1"); gDeferredAlphaImpostorProgram.addPermutation("FOR_IMPOSTOR", "1"); if (use_sun_shadow) @@ -2060,7 +2058,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredAlphaWaterProgram.clearPermutations(); gDeferredAlphaWaterProgram.addPermutation("USE_INDEXED_TEX", "1"); gDeferredAlphaWaterProgram.addPermutation("WATER_FOG", "1"); - gDeferredAlphaWaterProgram.addPermutation("USE_VERTEX_COLOR", "1"); if (use_sun_shadow) { gDeferredAlphaWaterProgram.addPermutation("HAS_SHADOW", "1"); |