diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-07 17:24:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-07 17:24:29 +0100 |
| commit | 4bd2b8b98ba1c562dfd65975a87ef5ee3db35633 (patch) | |
| tree | f1c959b2eec56508aeeceb08dfc14de750b0bc08 /indra/newview/lldrawpoolwlsky.cpp | |
| parent | 451ab80ca65a7ae75316442086f42b6553ea6bbe (diff) | |
Fix createDensityProfileLayer dropping passed in values.
Enable sky density panel to update advanced atmo precomputed textures.
Take wild stab at appropriate ranges for density parameters in edit panel UI.
Clean up debug-only code that isn't necessary anymore.
Point autobuild at latest version of libatmosphere package.
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index 3b3d67243a..41bf024942 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -505,22 +505,19 @@ void LLDrawPoolWLSky::renderDeferred(S32 pass) if (gPipeline.canUseWindLightShaders()) { + if (gPipeline.useAdvancedAtmospherics()) + { + renderSkyHazeDeferred(origin, camHeightLocal); + renderHeavenlyBodies(); + } + else { // Disable depth-test for sky, but re-enable depth writes for the cloud // rendering below so the cloud shader can write out depth for the stars to test against LLGLDepthTest depth(GL_TRUE, GL_FALSE); - if (gPipeline.useAdvancedAtmospherics()) - { - renderSkyHazeDeferred(origin, camHeightLocal); - } - else - { - renderSkyHaze(origin, camHeightLocal); - - } - renderHeavenlyBodies(); + renderSkyHaze(origin, camHeightLocal); + renderHeavenlyBodies(); } - renderSkyClouds(origin, camHeightLocal); } gGL.setColorMask(true, true); |
