diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-01 12:04:26 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-01 12:04:26 -0700 |
| commit | f770e55ac6fb76f1ea5e24a4dd91f2a4b4131d6d (patch) | |
| tree | 1d4b75f2a5f3490aa319608313063aae0d338a0b /indra/newview/app_settings/shaders/class1 | |
| parent | 2911cd3623b3e7e12945401db0e6a56758841ead (diff) | |
SL-11427
Fixed downscaling of the refscale passed in from WL in the water shader.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/waterF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/waterF.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl index b24da15a07..5a3a02d5d1 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl @@ -152,7 +152,7 @@ void main() spec = pow(spec, 128.0); //figure out distortion vector (ripply) - vec2 distort2 = distort+wavef.xy*(refScale * 0.01)/max(dmod*df1, 1.0); + vec2 distort2 = distort+wavef.xy*refScale/max(dmod*df1, 1.0); vec4 fb = texture2D(screenTex, distort2); fb.rgb = srgb_to_linear(fb.rgb); diff --git a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl index 4e550b8284..05fd4461c1 100644 --- a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl @@ -144,7 +144,7 @@ void main() spec = pow(spec, 128.0); //figure out distortion vector (ripply) - vec2 distort2 = distort+wavef.xy*(refScale*0.01)/max(dmod*df1, 1.0); + vec2 distort2 = distort+wavef.xy*refScale/max(dmod*df1, 1.0); vec4 fb = texture2D(screenTex, distort2); |