summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-12-05 18:10:08 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-12-05 18:10:08 +0200
commit7650fb53c8f2735c7cdf9178cd5ac1c6902cec8a (patch)
tree24dfa6a9e73cc2f24d00373fbf7c26a36d69757d /indra
parent031dabede84d3772bf857b7aca20b5378b99d06c (diff)
[EEP] NULL gAtmosphere crash fix
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldrawpoolwlsky.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index 9ce7912c45..8904020ab9 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -395,8 +395,11 @@ void LLDrawPoolWLSky::renderStarsDeferred(void) const
void LLDrawPoolWLSky::renderSkyCloudsAdvanced(const LLVector3& camPosLocal, F32 camHeightLocal, LLGLSLShader* cloudshader) const
{
- if (gPipeline.canUseWindLightShaders() && gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS) && gSky.mVOSkyp->getCloudNoiseTex())
- {
+ if (gPipeline.canUseWindLightShaders()
+ && gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS)
+ && gSky.mVOSkyp->getCloudNoiseTex()
+ && gAtmosphere)
+ {
LLGLSPipelineBlendSkyBox pipeline(true, true);
LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();