Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2013-11-19 04:44:55 +01:00
parent f21bec1ab9 8aa4d0fd27
commit 594eacb480
14 changed files with 313 additions and 270 deletions
--- a/indra/newview/app_settings/shaders/class1/deferred/underWaterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/underWaterF.glsl
@@ -151,7 +151,7 @@ void main()
 		
 	vec4 fb = texture2D(screenTex, distort);

-	frag_data[0] = vec4(linear_to_srgb(fb.rgb), 1.0); // diffuse
+	frag_data[0] = vec4(/*linear_to_srgb*/(fb.rgb), 1.0); // diffuse
 	frag_data[1] = vec4(0.5,0.5,0.5, 0.95); // speccolor*spec, spec
 	frag_data[2] = vec4(encode_normal(wavef), 0.0, 0.0); // normalxyz, displace
 }