diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-05-19 14:02:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-05-19 14:02:48 -0500 |
| commit | 3365a39080744af0566adb7b6efd8e53fc6b3339 (patch) | |
| tree | 4ad45f9b4df618458ad0b09b86a1f1d408d66876 /indra/newview/app_settings/shaders/class1/lighting | |
| parent | bf183ecff76809674f4fb0fa302138d554bc3628 (diff) | |
SL-17451 Fix for erroneous attempt to apply vertex color alpha to texture before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be).
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl index 690821bb56..ad2170bbd3 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl @@ -43,14 +43,14 @@ VARYING vec2 vary_texcoord0; void fullbright_lighting() { - vec4 color = diffuseLookup(vary_texcoord0.xy) * vertex_color; + vec4 color = diffuseLookup(vary_texcoord0.xy); if (color.a < minimum_alpha) { discard; } - //color.rgb *= vertex_color.rgb; + color *= vertex_color; color.rgb = pow(color.rgb, vec3(texture_gamma)); |