Fixes Retinex Method not read from PP3, issue 2833

This commit is contained in:
Beep6581
2015-10-31 21:27:43 +01:00
parent 7ba4a8f471
commit b98aa2966d
8 changed files with 21 additions and 29 deletions

View File

@@ -1082,9 +1082,9 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.retinex.str = dontforceSet && options.baBehav[ADDSET_RETI_STR] ? toEdit.retinex.str + mods.retinex.str : mods.retinex.str;
}
if (retinex.scal) {
toEdit.retinex.scal = dontforceSet && options.baBehav[ADDSET_RETI_SCAL] ? toEdit.retinex.scal + mods.retinex.scal : mods.retinex.scal;
}
// if (retinex.scal) {
// toEdit.retinex.scal = dontforceSet && options.baBehav[ADDSET_RETI_SCAL] ? toEdit.retinex.scal + mods.retinex.scal : mods.retinex.scal;
// }
if (retinex.medianmap) {
toEdit.retinex.medianmap = mods.retinex.medianmap;
@@ -2702,4 +2702,4 @@ bool LensProfParamsEdited::isUnchanged() const
bool RetinexParamsEdited::isUnchanged() const
{
return enabled && retinexcolorspace && gammaretinex && gam && slope;
}
}