diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-12 14:07:56 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-12 14:07:56 -0800 |
| commit | 9475a593a170f0c90a8d353de3e1277f844ee913 (patch) | |
| tree | 1d32cc3383b13fc51e2f6b7f03d50b7e0f63aa1b /indra/newview/lldrawpoolwlsky.cpp | |
| parent | 70ac8d9fa7049891ed1b65f68f112127dfb5f5f7 (diff) | |
| parent | 1cc8286c2097fb0896d40df6fe8ef311fa4c92ef (diff) | |
Merge
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 7 |
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(); |