liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-04-30 07:49:49 +02:00
parent ccf642bc6c 5d27eea860
commit 3ebbbdf139
56 changed files with 465 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
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;
@@ -844,7 +843,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;
@@ -2085,10 +2083,6 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
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;
}