diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-17 19:38:31 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-17 19:38:31 +0000 |
| commit | 5fa543fd5c6779e15c4567b807feead392f6ea3b (patch) | |
| tree | 32ff072265ba27fb397339e32975b92d2f8a0c8b /indra/newview | |
| parent | 027bc36259ebd27fe99b35feb4ec3c4680fb0bcf (diff) | |
| parent | eb5038fe755fd90b927359cd9fccd9ef2e951ca5 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #93)
SL-9618
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/underWaterF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/underWaterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/underWaterF.glsl index 3a8565ee38..db1eab23fb 100644 --- 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 } |