summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl10
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 72b1535332..4cbef89fef 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -272,14 +272,12 @@ void main()
vec2 abnormal = encode_normal(norm.xyz);
- vec4 final_color = diffuse_linear;
+ vec4 final_color = vec4(diffuse_linear.rgb, 0.0);
-#if (DIFFUSE_ALPHA_MODE != DIFFUSE_ALPHA_MODE_EMISSIVE)
- final_color.a = max(final_color.a, emissive_brightness);
- #if !defined(HAS_NORMAL_MAP)
- final_color.a = 0.0f;
- #endif
+#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_EMISSIVE)
+ final_color.a = diffuse_linear.a;
#endif
+ final_color.a = max(final_color.a, emissive_brightness);
vec4 final_specular = spec;
final_specular.a = specular_color.a;