Support blending current/next bloom textures in deferred star rendering.

2 files changed, 14 insertions, 3 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index d73ae5721a..2f5216eba9 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -382,7 +382,8 @@ LLSettingsSky::LLSettingsSky(const LLSD &data) :
     LLSettingsBase(data),
     mNextSunTextureId(),
     mNextMoonTextureId(),
-    mNextCloudTextureId()
+    mNextCloudTextureId(),
+    mNextBloomTextureId()
 {
 }
 
@@ -390,7 +391,8 @@ LLSettingsSky::LLSettingsSky():
     LLSettingsBase(),
     mNextSunTextureId(),
     mNextMoonTextureId(),
-    mNextCloudTextureId()
+    mNextCloudTextureId(),
+    mNextBloomTextureId()
 {
 }
 
@@ -412,6 +414,7 @@ void LLSettingsSky::blend(const LLSettingsBase::ptr_t &end, F64 blendf)
         mNextSunTextureId = other->getSunTextureId();
         mNextMoonTextureId = other->getMoonTextureId();
         mNextCloudTextureId = other->getCloudNoiseTextureId();
+        mNextBloomTextureId = other->getBloomTextureId();
     }
     else
     {
@@ -637,7 +640,7 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position)
         dfltsetting[SETTING_SUNLIGHT_COLOR]     = LLColor4(0.7342, 0.7815, 0.8999, 0.0).getValue();
         dfltsetting[SETTING_SUN_ROTATION]       = sunquat.getValue();
 
-        dfltsetting[SETTING_BLOOM_TEXTUREID]    = IMG_BLOOM1;
+        dfltsetting[SETTING_BLOOM_TEXTUREID]    = GetDefaultBloomTextureId();
         dfltsetting[SETTING_CLOUD_TEXTUREID]    = GetDefaultCloudNoiseTextureId();
         dfltsetting[SETTING_MOON_TEXTUREID]     = GetDefaultMoonTextureId();
         dfltsetting[SETTING_SUN_TEXTUREID]      = GetDefaultSunTextureId();
@@ -1366,3 +1369,9 @@ LLUUID LLSettingsSky::getNextCloudNoiseTextureId() const
 {
     return mNextCloudTextureId;
 }
+
+LLUUID LLSettingsSky::getNextBloomTextureId() const
+{
+    return mNextBloomTextureId;
+}
+
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index e7b4678f7f..00b7c5b37b 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -183,6 +183,7 @@ public:
     LLUUID getNextSunTextureId() const;
     LLUUID getNextMoonTextureId() const;
     LLUUID getNextCloudNoiseTextureId() const;
+    LLUUID getNextBloomTextureId() const;
 
     //=====================================================================
     virtual void loadTextures() { };
@@ -272,6 +273,7 @@ private:
     LLUUID      mNextSunTextureId;
     LLUUID      mNextMoonTextureId;
     LLUUID      mNextCloudTextureId;
+    LLUUID      mNextBloomTextureId;
 
     typedef std::map<std::string, S32> mapNameToUniformId_t;