diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-08-31 10:16:24 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-08-31 10:16:24 -0700 |
| commit | 71115a7a2727301dbf8ba62a082cc9fa1d310a8d (patch) | |
| tree | 1fff229e1dd5365945bd850ab1e84c8ca693846d /indra/newview/pipeline.cpp | |
| parent | 5c0e201cd61cf7b29b8871864c8fc7f90c82b5cd (diff) | |
| parent | 8eaee1f033d9dac892e749cc65416e149021d8f6 (diff) | |
SL-17703: Fix merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 91d276c8df..67f0ea68c1 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8643,6 +8643,11 @@ void LLPipeline::renderDeferredLighting(LLRenderTarget *screen_target) soften_shader.uniform1i(LLShaderMgr::SUN_UP_FACTOR, environment.getIsSunUp() ? 1 : 0); soften_shader.uniform4fv(LLShaderMgr::LIGHTNORM, 1, environment.getClampedLightNorm().mV); + if (!LLPipeline::sUnderWaterRender && LLPipeline::sRenderPBR) + { + soften_shader.bindTexture(LLShaderMgr::ALTERNATE_DIFFUSE_MAP, LLViewerFetchedTexture::sDefaultIrradiancePBRp); // PBR: irradiance + } + if(LLPipeline::sRenderPBR) { LLVector3 cameraAtAxis = LLViewerCamera::getInstance()->getAtAxis(); |