diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-12-09 16:34:28 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-12-09 16:34:28 -0500 |
| commit | f41278082f2ab204ec60c15ee1530ca4440937a5 (patch) | |
| tree | c382bb0e6cde299e853d09b19a47f1d82dc537fa /indra/newview/llvosky.cpp | |
| parent | fc424a0db90fd2d2e44e85a19750ad6eaa57b28a (diff) | |
| parent | e3b34fec6962e6deda3dd9dd83bf9fa20ab594af (diff) | |
SL-18809: Merge 'DRTVWR-559' of secondlife/viewer into sl-18809
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 5adc057484..d5979b2280 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -525,11 +525,6 @@ void LLVOSky::calc() void LLVOSky::initCubeMap() { - if (LLPipeline::sReflectionProbesEnabled) - { - return; - } - std::vector<LLPointer<LLImageRaw> > images; for (S32 side = 0; side < NUM_CUBEMAP_FACES; side++) { @@ -697,7 +692,7 @@ bool LLVOSky::updateSky() LLHeavenBody::setInterpVal( mInterpVal ); updateDirections(psky); - if (!mCubeMap) + if (!mCubeMap || LLPipeline::sReflectionProbesEnabled) { mCubeMapUpdateStage = NUM_CUBEMAP_FACES; mForceUpdate = FALSE; |