livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double blend and warnings reported as errors.

master
Graham Linden 2018-06-22 01:00:23 +01:00
parent a02b3500b9
commit 02ffb06463
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llinventory/llsettingsbase.cpp
View File

@ -298,8 +298,9 @@ bool LLSettingsBase::validate()
}
if (result["warnings"].size() > 0)
{
LL_WARNS("SETTINGS") << "Validation warnings: " << result["errors"] << LL_ENDL;
LL_WARNS("SETTINGS") << "Validation warnings: " << result["warnings"] << LL_ENDL;
}
LL_WARNS("SETTINGS") << "Validation success is " << result["success"] << LL_ENDL;
return result["success"].asBoolean();
}
@ -593,7 +594,6 @@ F64 LLSettingsBlender::setBlendFactor(const LLSettingsBase::BlendFactor& blendf_
{
LL_WARNS("SETTINGS") << "No target for settings blender." << LL_ENDL;
}
mTarget->blend(mFinal, blendf);
return blendf;
}