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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/llsky.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsky.h b/indra/newview/llsky.h index cc5db2c7ec..d2067a58bb 100644 --- a/indra/newview/llsky.h +++ b/indra/newview/llsky.h @@ -59,6 +59,7 @@ public: void setSunTextures(const LLUUID& sun_texture, const LLUUID& sun_texture_next); void setMoonTextures(const LLUUID& moon_texture, const LLUUID& moon_texture_next); void setCloudNoiseTextures(const LLUUID& cloud_noise_texture, const LLUUID& cloud_noise_texture_next); + void setBloomTextures(const LLUUID& bloom_texture, const LLUUID& bloom_texture_next); LLColor4 getSkyFogColor() const; |