summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMichael Pohoreski <ptolemy@lindenlab.com>2022-03-25 15:53:38 +0000
committerMichael Pohoreski <ptolemy@lindenlab.com>2022-03-25 15:53:38 +0000
commit68b732c78a47a57a1717619b4214ff106659c799 (patch)
tree87d24e45b4982b82ddecf578d96f0b54451dcf03 /indra/newview/app_settings
parent43069379a2ed2c290fc51f775ebb1e350303325b (diff)
parent96178e689b3df429e2768566afe817b0f7e7cc1d (diff)
Merged DRTVWR-546 into SL-16993
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index d3a05c34c0..638a0f4e15 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -215,6 +215,11 @@ void main()
float final_alpha = diffuse_linear.a;
#ifdef USE_VERTEX_COLOR
+ if (vertex_color.a <= 0.0)
+ { // TODO: figure out how to get invisible faces out of
+ // render batches without breaking glow
+ discard;
+ }
final_alpha *= vertex_color.a;
diffuse_srgb.rgb *= vertex_color.rgb;
diffuse_linear.rgb = srgb_to_linear(diffuse_srgb.rgb);
@@ -308,7 +313,7 @@ vec3 post_atmo = color.rgb;
#endif // WATER_FOG
#endif
-
+
frag_color = color;
}