Merged in graham_linden/viewer-eep-graham (pull request #93)

SL-9618
2018-09-17 19:38:31 +00:00 · 2018-09-17 19:38:31 +00:00 · 5fa543fd5c
parent 027bc36259 eb5038fe75
commit 5fa543fd5c
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/app_settings/shaders/class1/deferred/underWaterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/underWaterF.glsl
@ -115,7 +115,7 @@ void main()
 		
 	vec4 fb = texture2D(screenTex, distort);

-	frag_data[0] = vec4(linear_to_srgb(fb.rgb), 1.0); // diffuse
+	frag_data[0] = vec4(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
 }