diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-07-10 20:30:44 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-07-10 20:30:44 +0000 |
| commit | 9da2480891a1b866437c0ba48dc649299c021ab8 (patch) | |
| tree | c1d6ea73fc55a59bb0028503ae0a7c26dfafb168 /indra/newview/llsettingsvo.cpp | |
| parent | b83c028c001ef896eb235fbcdbb2ac2368787135 (diff) | |
| parent | a90e61b798711306496c2ed7aa5cce6d096ea466 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #22)
Support blending current/next bloom textures in deferred star rendering.
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index dba7e00b93..a5187b7363 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -538,6 +538,7 @@ void LLSettingsVOSky::updateSettings() gSky.setSunTextures(getSunTextureId(), getNextSunTextureId()); gSky.setMoonTextures(getMoonTextureId(), getNextMoonTextureId()); gSky.setCloudNoiseTextures(getCloudNoiseTextureId(), getNextCloudNoiseTextureId()); + gSky.setBloomTextures(getBloomTextureId(), getNextBloomTextureId()); } void LLSettingsVOSky::applySpecial(void *ptarget) |