diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-29 05:52:26 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-29 05:52:26 +0800 |
| commit | 1c5777bd52bc581841d832b52572370395f86ff7 (patch) | |
| tree | 25867742f8be6accd9bc5aaffa0b2acb21ac95b4 /indra/newview/app_settings/shaders/class3 | |
| parent | 7bb1791be2a2f41a381736e3f2ca2a5ccde37063 (diff) | |
| parent | 8eff224c121f8e08514b28326d4c886e4acd35ab (diff) | |
Merge tag 'Second_Life_Release#8eff224c-2025.03' into 2025.03
Diffstat (limited to 'indra/newview/app_settings/shaders/class3')
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/environment/waterF.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl index 8c3851fdbb..366335b4f6 100644 --- a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl +++ b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl @@ -26,6 +26,7 @@ // class3/environment/waterF.glsl #define WATER_MINIMAL 1 +#define SHORELINE_FADE 1 out vec4 frag_color; @@ -266,7 +267,7 @@ void main() // Calculate some distance fade in the water to better assist with refraction blending and reducing the refraction texture's "disconnect". #ifdef SHORELINE_FADE - fade = max(0.0,min(1.0, (pos.z - refPos.z) / 10.0)) + fade = max(0.0,min(1.0, (pos.z - refPos.z) / 10.0)); #else fade = 1.0 * water_mask; #endif |