From 203ae9dfa3bae86a90e21ffed99059729632a68b Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 11 Nov 2013 18:56:16 -0600
Subject: [PATCH] Fix uninitialized variable warning in alphaF.glsl. Also made
 USE_VERTEX_COLOR actually work if FOR_IMPOSTOR is set.

---
 .../app_settings/shaders/class1/deferred/alphaF.glsl      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index 24b159bad..6a2117ad6 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -534,8 +534,6 @@ void main()
 #endif
 
 #ifdef FOR_IMPOSTOR
-	vec4 color;
-	color.rgb = diff.rgb;
 
 #ifdef USE_VERTEX_COLOR
 	float final_alpha = diff.a * vertex_color.a;
@@ -550,6 +548,7 @@ void main()
 	{
 		discard;
 	}
+	vec4 color = vec4(diff.rgb,final_alpha);
 #else
 	
 #ifdef USE_VERTEX_COLOR
@@ -578,10 +577,7 @@ void main()
 		  final_da = min(final_da, 1.0f);
 		  final_da = pow(final_da, 1.0/1.3);
 
-	vec4 color = vec4(0,0,0,0);
-
-	color.rgb = atmosAmbient(color.rgb);
-	color.a   = final_alpha;
+	vec4 color = vec4(getAmblitColor(),final_alpha);
 
 	float ambient = abs(da);
 	ambient *= 0.5;