1 files changed, 16 insertions, 11 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
index 2cc3085cd0..a2341a80ab 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
@@ -40,6 +40,8 @@ in vec2 vary_texcoord0;
 in vec3 vary_position;
 
 void mirrorClip(vec3 pos);
+vec4 encodeNormal(vec3 n, float env, float gbuffer_flag);
+
 void main()
 {
     mirrorClip(vary_position);
@@ -50,18 +52,21 @@ void main()
     {
         discard;
     }
-        col *= vertex_color;
+    col *= vertex_color;
+
+    vec3 norm = texture(bumpMap, vary_texcoord0.xy).rgb * 2.0 - 1.0;
 
-        vec3 norm = texture(bumpMap, vary_texcoord0.xy).rgb * 2.0 - 1.0;
+    vec3 tnorm = vec3(dot(norm,vary_mat0),
+            dot(norm,vary_mat1),
+            dot(norm,vary_mat2));
 
-        vec3 tnorm = vec3(dot(norm,vary_mat0),
-              dot(norm,vary_mat1),
-              dot(norm,vary_mat2));
+    frag_data[0] = vec4(col.rgb, 0.0);
+    frag_data[1] = vertex_color.aaaa; // spec
+    //frag_data[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested
+    vec3 nvn = normalize(tnorm);
+    frag_data[2] = encodeNormal(nvn, vertex_color.a, GBUFFER_FLAG_HAS_ATMOS);
 
-        frag_data[0] = vec4(col.rgb, 0.0);
-        frag_data[1] = vertex_color.aaaa; // spec
-        //frag_data[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested
-        vec3 nvn = normalize(tnorm);
-        frag_data[2] = vec4(nvn, GBUFFER_FLAG_HAS_ATMOS);
-        frag_data[3] = vec4(vertex_color.a, 0, 0, 0);
+#if defined(HAS_EMISSIVE)
+    frag_data[3] = vec4(0, 0, 0, 0);
+#endif
 }