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/llsky.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/llsky.cpp')
| -rw-r--r-- | indra/newview/llsky.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp index 5d85778da5..9c7fc225a0 100644 --- a/indra/newview/llsky.cpp +++ b/indra/newview/llsky.cpp @@ -150,6 +150,13 @@ void LLSky::setCloudNoiseTextures(const LLUUID& cloud_noise_texture, const LLUUI } } +void LLSky::setBloomTextures(const LLUUID& bloom_texture, const LLUUID& bloom_texture_next) +{ + if(mVOSkyp.notNull()) { + mVOSkyp->setBloomTextures(bloom_texture, bloom_texture_next); + } +} + void LLSky::setSunAndMoonDirectionsCFR(const LLVector3 &sun_direction, const LLVector3 &moon_direction) { if(mVOSkyp.notNull()) { |