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:
U-PC-BUREAU\jacques
2018-10-19 19:26:14 +02:00
parent bda6ad9235 72699902a3
commit e7448bd084
198 changed files with 2052 additions and 1128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
View File

@@ -292,6 +292,7 @@ void ParamsEdited::set(bool v)
sh.shadows = v;
sh.stonalwidth = v;
sh.radius = v;
sh.lab = v;
crop.enabled = v;
crop.x = v;
crop.y = v;
@@ -966,6 +967,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
sh.shadows = sh.shadows && p.sh.shadows == other.sh.shadows;
sh.stonalwidth = sh.stonalwidth && p.sh.stonalwidth == other.sh.stonalwidth;
sh.radius = sh.radius && p.sh.radius == other.sh.radius;
sh.lab = sh.lab && p.sh.lab == other.sh.lab;
crop.enabled = crop.enabled && p.crop.enabled == other.crop.enabled;
crop.x = crop.x && p.crop.x == other.crop.x;
crop.y = crop.y && p.crop.y == other.crop.y;
@@ -2346,6 +2348,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.sh.radius = mods.sh.radius;
}
if (sh.lab) {
toEdit.sh.lab = mods.sh.lab;
}
if (crop.enabled) {
toEdit.crop.enabled = mods.crop.enabled;
}