Merge tag 'Second_Life_Release#3529bc5f-2026.02' into 2026.02

2 files changed, 10 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
index dd9e883fdf..abe61fe892 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
@@ -146,6 +146,9 @@ vec3 srgb_to_linear(vec3 c);
 void main()
 {
     vec4 basecolor = texture(diffuseMap, base_color_texcoord.xy).rgba;
+
+    basecolor.a *= vertex_color.a;
+
     if (basecolor.a < minimum_alpha)
     {
         discard;
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
index 50b40e9c20..b08193a7dd 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
@@ -51,9 +51,7 @@ in vec3 vary_norm;
 in vec4 vertex_color; //vertex color should be treated as sRGB
 #endif
 
-#ifdef HAS_ALPHA_MASK
 uniform float minimum_alpha;
-#endif
 
 uniform mat4 proj_mat;
 uniform mat4 inv_proj;
@@ -225,6 +223,13 @@ void main()
 
     float final_alpha = diffuse_linear.a;
 
+#ifdef IS_AVATAR_SKIN
+    if(final_alpha < minimum_alpha)
+    {
+        discard;
+    }
+#endif
+
 #ifdef USE_VERTEX_COLOR
     final_alpha *= vertex_color.a;