From b32f879a6d60fcb9a34435b2b7e9a4509fd32cc6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 8 Jul 2013 12:17:41 -0700
Subject: NORSPEC-293 WIP fix black glowing fullbright, does not address
 deferred glow errors

---
 indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index ec25f52ef5..90518128fb 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -70,10 +70,10 @@ void main()
 #endif
 
 	color.rgb = srgb_to_linear(color.rgb);
-	color.rgb *= vertex_color.rgb;
 
 	color.rgb = fullbrightAtmosTransport(color.rgb);
 	color.rgb = fullbrightScaleSoftClip(color.rgb);
+	color.rgb *= vertex_color.rgb;
 
 	color.rgb = linear_to_srgb(color.rgb);
 
-- 
cgit v1.2.3