From 1e26adf288f8b4585c0ce8338dd548475613862c Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Fri, 22 Jan 2021 16:31:50 -0800
Subject: SL-14707: Merge Sovereign Engineer's fix for clouds: Clouds are
unusually dim in EEP
---
doc/contributions.txt | 1 +
indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl | 1 +
indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl | 1 +
3 files changed, 3 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c91587d5c3..3e458e9476 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1354,6 +1354,7 @@ Sovereign Engineer
SL-11079
OPEN-343
SL-11625
+ SL-14707
SpacedOut Frye
VWR-34
VWR-45
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
index a132220bef..8e0a001403 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
@@ -166,6 +166,7 @@ void main()
(blue_horizon * blue_weight * (sunlight + tmpAmbient) + (haze_horizon * haze_weight) * (sunlight * haze_glow + tmpAmbient));
// CLOUDS
+ sunlight = sunlight_color; // SL-14707 reset color -- Clouds are unusually dim in EEP
off_axis = 1.0 / max(1e-6, lightnorm.y * 2.);
sunlight *= exp(-light_atten * off_axis);
diff --git a/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl
index b004cc7ddd..97ffa9feef 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl
@@ -166,6 +166,7 @@ void main()
(blue_horizon * blue_weight * (sunlight + tmpAmbient) + (haze_horizon * haze_weight) * (sunlight * haze_glow + tmpAmbient));
// CLOUDS
+ sunlight = sunlight_color; // SL-14707 reset color -- Clouds are unusually dim in EEP
off_axis = 1.0 / max(1e-6, lightnorm.y * 2.);
sunlight *= exp(-light_atten * off_axis);
--
cgit v1.2.3