code cleanup after the new shadows/highlights tool

This commit is contained in:
Alberto Griggio
2018-04-13 15:43:06 +02:00
parent 25b066e257
commit 4df4fd6370
18 changed files with 16 additions and 248 deletions

View File

@@ -283,7 +283,6 @@ void ParamsEdited::set (bool v)
fattal.amount = v;
fattal.anchor = v;
sh.enabled = v;
sh.hq = v;
sh.highlights = v;
sh.htonalwidth = v;
sh.shadows = v;
@@ -849,7 +848,6 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
fattal.anchor = fattal.anchor && p.fattal.anchor == other.fattal.anchor;
sh.enabled = sh.enabled && p.sh.enabled == other.sh.enabled;
sh.hq = sh.hq && p.sh.hq == other.sh.hq;
sh.highlights = sh.highlights && p.sh.highlights == other.sh.highlights;
sh.htonalwidth = sh.htonalwidth && p.sh.htonalwidth == other.sh.htonalwidth;
sh.shadows = sh.shadows && p.sh.shadows == other.sh.shadows;
@@ -2088,10 +2086,6 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.sh.enabled = mods.sh.enabled;
}
if (sh.hq) {
toEdit.sh.hq = mods.sh.hq;
}
if (sh.highlights) {
toEdit.sh.highlights = dontforceSet && options.baBehav[ADDSET_SH_HIGHLIGHTS] ? toEdit.sh.highlights + mods.sh.highlights : mods.sh.highlights;
}