diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-14 21:48:47 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-14 21:48:47 +0000 |
| commit | 636839a47c6881b10d676d19c65d6c34a956622a (patch) | |
| tree | 7e9bfa4e4490b60908df54f6572b964c4e3a3b3a /indra/newview/lldrawpoolmaterials.cpp | |
| parent | 6298f0b0e3aa8c9d5b71a1c5b26a3232c25601cc (diff) | |
| parent | 1df7760d315430766bba44d4d4c64480b4a6138f (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #88)
SL-9632
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index 63e96a93b5..113c198a9a 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -81,6 +81,15 @@ void LLDrawPoolMaterials::beginDeferredPass(S32 pass) mShader->bind(); + if (LLPipeline::sRenderingHUDs) + { + mShader->uniform1i(LLShaderMgr::NO_ATMO, 1); + } + else + { + mShader->uniform1i(LLShaderMgr::NO_ATMO, 0); + } + diffuse_channel = mShader->enableTexture(LLShaderMgr::DIFFUSE_MAP); LL_RECORD_BLOCK_TIME(FTM_RENDER_MATERIALS); |