diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-30 00:23:22 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-30 00:23:22 +0100 |
| commit | f334453af1cb2e7085cbe72da4fee357afceb80f (patch) | |
| tree | 666447d52ffa8fb7bc6db8a7e14995897e47d8b5 /indra/llinventory/llsettingswater.cpp | |
| parent | 38a6f3b0dfd56ceb09bc5a689a678038f8022603 (diff) | |
| parent | 2ee1f40411a9036c8d9d4d6cb6f9b75dead61315 (diff) | |
Merge
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(); |