summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2023-02-02 16:15:14 -0600
committerDave Parks <davep@lindenlab.com>2023-02-02 16:15:14 -0600
commit1962f0b3b1d140a64bdc0ed77119f859d1d02a8e (patch)
treeddf0340bf3a03a33fac4d1688ceb30cc68a40115 /indra/newview/app_settings
parent9b9c8adbb0013d55574fb49346b21bf4392f77db (diff)
DRTVWR-559 Merge fix.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/skyV.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
index 3b24311f2b..1424b57d6f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
@@ -96,7 +96,7 @@ void main()
vec3 light_atten = (blue_density + vec3(haze_density * 0.25)) * (density_multiplier * max_y);
// Calculate relative weights
- vec3 combined_haze = abs(blue_density) + vec4(abs(haze_density));
+ vec3 combined_haze = abs(blue_density) + vec3(abs(haze_density));
vec3 blue_weight = blue_density / combined_haze;
vec3 haze_weight = haze_density / combined_haze;