Merge branch 'master' of gitorious.org:fg/fgdata into work

Materials/default/materials.xml

@@ -2195,6 +2195,16 @@
 
  <!-- runway and taxiway signs -->
 
+<material>
+  <name>signcase</name>
+  <texture>Signs/signs_case.png</texture>
+   <emissive>
+     <r>0.1</r>
+     <g>0.1</g>
+     <b>0.1</b>
+   </emissive>
+  <glyph> <name>cover</name> <left>0.00000</left> <right>0.625</right> </glyph>
+</material>
 
 <material>
   <name>YellowSign.unlighted</name>

Shaders/gbuffer-encode.frag

@@ -17,6 +17,8 @@ void encode_gbuffer(vec3 normal, vec3 color, int mId, float specular, float shin
     gl_FragData[0] = vec4( normal_encode(normal), 0.0, 1.0 );
     gl_FragData[1] = vec4( color, float( mId ) / 255.0 );
     gl_FragData[2] = vec4( specular, shininess / 128.0, emission, 1.0 );
+    vec3 dcol = vec3(1.0, 1.0, 1.0);
     if (fg_DepthInColor)
-        gl_FragData[3] = vec4(float_to_color(depth), 1.0);
+        dcol = float_to_color(depth);
+    gl_FragData[3] = vec4(dcol, 1.0);
 }