diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-16 23:45:56 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-16 23:45:56 +0100 |
| commit | 4d4a7dfb9f28007c2ceb53668d065bbe0fa332af (patch) | |
| tree | 9c9929e754fa8f6d0ad6c8fdc15c0fa494dbd0b6 /indra/newview/lldrawpoolwlsky.cpp | |
| parent | 3116416fcb8dfd54ef2807e9e75959429c946d79 (diff) | |
| parent | 67a16cad8ab5c928f34b4299eae5499b59c3aa83 (diff) | |
Merge and disable new sky render.
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index 789e79bb31..e5a7398d4f 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -373,9 +373,11 @@ void LLDrawPoolWLSky::renderDeferred(S32 pass) LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin(); - renderSkyHazeDeferred(origin, camHeightLocal); + //renderSkyHazeDeferred(origin, camHeightLocal); - if (gPipeline.canUseWindLightShaders()) + renderSkyHaze(origin, camHeightLocal); + + if (!gPipeline.useAdvancedAtmospherics() && gPipeline.canUseWindLightShaders()) { LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin(); gGL.pushMatrix(); |