diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-29 23:05:16 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-29 23:05:16 +0000 |
| commit | 2ee1f40411a9036c8d9d4d6cb6f9b75dead61315 (patch) | |
| tree | 6d74d11ed7904ce0ec56602ac6a000a2ba6db489 /indra/llinventory/llsettingswater.cpp | |
| parent | 536799d07e4298ff8157ef51ed00040e10a5ba65 (diff) | |
| parent | 659d14504f6ab4ad283efe4ecd950a4483e1498f (diff) | |
Merged in andreykproductengine/maint-eep (pull request #169)
SL-1476 EEP Better shader resets and transitions
Approved-by: Graham Madarasz <graham@lindenlab.com>
Diffstat (limited to 'indra/llinventory/llsettingswater.cpp')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index 87744453ed..7cfff954a0 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -178,7 +178,7 @@ void LLSettingsWater::blend(const LLSettingsBase::ptr_t &end, F64 blendf) LLSettingsWater::ptr_t other = PTR_NAMESPACE::static_pointer_cast<LLSettingsWater>(end); if (other) { - LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, blendf); + LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, other->getParameterMap(), blendf); replaceSettings(blenddata); mNextNormalMapID = other->getNormalMapID(); mNextTransparentTextureID = other->getTransparentTextureID(); |