summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-11-13 17:27:12 +0000
committerRider Linden <rider@lindenlab.com>2018-11-13 17:27:12 +0000
commit4231714698018b8bd75f3f57df849f81cab05d9c (patch)
tree8695606e3038ee5e5d31f2b7c0c8c1a63fc540d8 /indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl
parentbda785e8b1bef35ecd9d45a7092b0ab66c17d1f4 (diff)
parenta49e2b604e6b505e083e24b10e39053196d917c1 (diff)
Merged in graham_linden/viewer-eep-fixes (pull request #189)
SL-10044 SL-10045
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl
index 229f8073b0..9653e0809e 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl
@@ -52,13 +52,13 @@ vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten)
return light;
}
light *= atten.r;
- light += additive;
+ light += additive * 2.0;
return light;
}
vec3 atmosLighting(vec3 light)
{
- return (no_atmo == 1) ? light : atmosFragLighting(light, getAdditiveColor(), getAtmosAttenuation());
+ return atmosFragLighting(light, getAdditiveColor(), getAtmosAttenuation());
}
void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {