diff options
author | Graham Linden <graham@lindenlab.com> | 2013-07-17 08:03:09 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-07-17 08:03:09 -0700 |
commit | 9aeb3b48d77ce9e22445b4bca23d36f651bb9395 (patch) | |
tree | 361f26474eaa092f0fe528c1bb4600d871cb25f2 /indra/newview/app_settings/shaders/class1/deferred | |
parent | 1587999b0329c76d108fcd1efe2d3fb768043e9e (diff) |
NORSPEC-291 fix materials underwater, disable attempt at materials in reflect/distort RTs
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/waterF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl index 17288873c8..46d5b9b612 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl @@ -192,7 +192,7 @@ void main() //wavef = normalize(wavef); vec3 screenspacewavef = (norm_mat*vec4(wavef, 1.0)).xyz; - frag_data[0] = vec4(linear_to_srgb(color.rgb), 0.5); // diffuse + frag_data[0] = vec4(color.rgb, 0.5); // diffuse frag_data[1] = vec4(0.5,0.5,0.5, 0.95); // speccolor*spec, spec frag_data[2] = vec4(encode_normal(screenspacewavef), 0.0, 0.0); // normalxyz, displace } |