summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-05-17 13:23:08 -0500
committerDave Parks <davep@lindenlab.com>2022-05-17 13:23:08 -0500
commit85b3f707d3f6fbe39a0d372cfb6c029367f68a24 (patch)
treebb8596d5dc4437ea4136598686ce00a6114bb985 /indra/newview/app_settings
parentc7ddba7eb4b4e47b0a9371fef41339f7941eefdb (diff)
SL-17421 Fix for fullbright alpha mask shader ignoring vertex alpha
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl4
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 1855cfceeb..690821bb56 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);
+ vec4 color = diffuseLookup(vary_texcoord0.xy) * vertex_color;
if (color.a < minimum_alpha)
{
discard;
}
- color.rgb *= vertex_color.rgb;
+ //color.rgb *= vertex_color.rgb;
color.rgb = pow(color.rgb, vec3(texture_gamma));