Merged in graham_linden/viewer-eep-g (pull request #412)

SL-11343
2019-05-31 22:27:29 +00:00 · 2019-05-31 22:27:29 +00:00 · c137cf0556
parent 57116089d0 ee9ad6520e
commit c137cf0556
1 changed files with 1 additions and 0 deletions
--- 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);