Merged in euclid_SL-12784 (pull request #31)

SL-12784 restore vertex color alpha contribution
2020-03-12 23:08:11 +00:00 · 2020-03-12 23:08:11 +00:00 · f840297e3d
parent 23953e416e c7f2712d95
commit f840297e3d
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@ -214,7 +214,7 @@ void main()
    vec2 pos_screen = vary_texcoord0.xy;

    vec4 diffuse_srgb = texture2D(diffuseMap, vary_texcoord0.xy);
-    diffuse_srgb.rgb *= vertex_color.rgb;
+    diffuse_srgb *= vertex_color;
    vec4 diffuse_linear = vec4(srgb_to_linear(diffuse_srgb.rgb), diffuse_srgb.a);

 #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_MASK)