diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-15 21:28:29 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-15 21:28:29 +0000 |
| commit | bcd25608080c4488c2531da61aec5e5eb9bbd136 (patch) | |
| tree | a46e9150e6ce721ec892373770fe07c65c7399e3 /indra | |
| parent | 92f5d5428e83e0469041ea367ea5a8637194523c (diff) | |
| parent | 78da30936ce72649ab0bcc0276ce06b9c26c4317 (diff) | |
Merged in drtvwr497_revert_PR297 (pull request #301)
Revert "SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting (pull request #297)"
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index 4d077379cb..d4e7f1600e 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -184,7 +184,6 @@ void LLDrawPoolWLSky::renderSkyHazeDeferred(const LLVector3& camPosLocal, F32 ca ((LLSettingsVOSky*)psky.get())->updateShader(sky_shader); - bool is_sun_up = psky->getIsSunUp(); F32 moisture_level = (float)psky->getSkyMoistureLevel(); F32 droplet_radius = (float)psky->getSkyDropletRadius(); F32 ice_level = (float)psky->getSkyIceLevel(); @@ -200,9 +199,9 @@ void LLDrawPoolWLSky::renderSkyHazeDeferred(const LLVector3& camPosLocal, F32 ca sky_shader->uniform1f(LLShaderMgr::DROPLET_RADIUS, droplet_radius); sky_shader->uniform1f(LLShaderMgr::ICE_LEVEL, ice_level); - sky_shader->uniform1f(LLShaderMgr::SUN_MOON_GLOW_FACTOR, is_sun_up ? psky->getSunMoonGlowFactor() : 0.0f ); // SL-13768 + sky_shader->uniform1f(LLShaderMgr::SUN_MOON_GLOW_FACTOR, psky->getSunMoonGlowFactor()); - sky_shader->uniform1i(LLShaderMgr::SUN_UP_FACTOR, is_sun_up ? 1 : 0); + sky_shader->uniform1i(LLShaderMgr::SUN_UP_FACTOR, psky->getIsSunUp() ? 1 : 0); /// Render the skydome renderDome(origin, camHeightLocal, sky_shader); |