diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-03-12 23:08:11 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-03-12 23:08:11 +0000 |
| commit | f840297e3daf6f4d42eae383da52aeabec4bb7a6 (patch) | |
| tree | 49a38d29573d5b328e2c4eb3c5a21ca8c4a207ef /indra | |
| parent | 23953e416e007f082acd59157e6dfb9455917bc5 (diff) | |
| parent | c7f2712d9576c0122726104f74690c1ee5f94ae2 (diff) | |
Merged in euclid_SL-12784 (pull request #31)
SL-12784 restore vertex color alpha contribution
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index 5999063ae5..553c2f3045 100644 --- 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) |