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-01-26 18:00:33 +01:00
parent 62d9825bce 24151b313a
commit 4a29e34e20
51 changed files with 591 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/paramsedited.cc
View File

@@ -280,6 +280,7 @@ void ParamsEdited::set(bool v)
fattal.enabled = v;
fattal.threshold = v;
fattal.amount = v;
fattal.anchor = v;
sh.enabled = v;
sh.hq = v;
sh.highlights = v;
@@ -957,6 +958,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
fattal.enabled = fattal.enabled && p.fattal.enabled == other.fattal.enabled;
fattal.threshold = fattal.threshold && p.fattal.threshold == other.fattal.threshold;
fattal.amount = fattal.amount && p.fattal.amount == other.fattal.amount;
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;
@@ -2303,6 +2305,9 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
if (fattal.amount) {
toEdit.fattal.amount = mods.fattal.amount;
}
if (fattal.anchor) {
toEdit.fattal.anchor = mods.fattal.anchor;
}
if (sh.enabled) {