summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolwlsky.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-08-31 16:23:28 +0000
committerRider Linden <rider@lindenlab.com>2018-08-31 16:23:28 +0000
commitcb7592e4904ce4dcfb472d24b2da50bf50351091 (patch)
tree7fcf4419b2756fc9d5ec55363fc370791364f506 /indra/newview/lldrawpoolwlsky.cpp
parent9480ee9a4dbb5247029ec840a58e40db9c43f69a (diff)
parentc46b70c25770a7421486498df6a280c00bae5a2d (diff)
Merged in graham_linden/viewer-eep-graham (pull request #65)
MAINT-8983
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
-rw-r--r--indra/newview/lldrawpoolwlsky.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index 2ae361eb4d..ea59fd7825 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -91,6 +91,10 @@ void LLDrawPoolWLSky::beginRenderPass( S32 pass )
void LLDrawPoolWLSky::endRenderPass( S32 pass )
{
+ sky_shader = nullptr;
+ cloud_shader = nullptr;
+ sun_shader = nullptr;
+ moon_shader = nullptr;
}
void LLDrawPoolWLSky::beginDeferredPass(S32 pass)
@@ -111,7 +115,10 @@ void LLDrawPoolWLSky::beginDeferredPass(S32 pass)
void LLDrawPoolWLSky::endDeferredPass(S32 pass)
{
-
+ sky_shader = nullptr;
+ cloud_shader = nullptr;
+ sun_shader = nullptr;
+ moon_shader = nullptr;
}
void LLDrawPoolWLSky::renderFsSky(const LLVector3& camPosLocal, F32 camHeightLocal, LLGLSLShader * shader) const