summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-31 15:25:54 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-31 15:25:54 -0700
commitee9ad6520ec0cad689a9dfa7ca55717a43f2e897 (patch)
tree029174491c8ca3db4bd82250eef209de3f1a53e1 /indra/newview/app_settings/shaders
parentb507392b780d58159de426c0827422f198997c22 (diff)
SL-11343
Make materials apply vertex color to both linear and srgb versions of diffuse color.
Diffstat (limited to 'indra/newview/app_settings/shaders')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 8e0b903d04..1e7ca08aa1 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -243,6 +243,7 @@ void main()
#endif
diffuse_linear.rgb *= vertex_color.rgb;
+ diffuse_srgb.rgb *= linear_to_srgb(vertex_color.rgb);
#ifdef HAS_SPECULAR_MAP
vec4 spec = texture2D(specularMap, vary_texcoord2.xy);