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

merge with dev - I hope no error

Browse Source
This commit is contained in:
Desmis
2017-02-21 18:02:48 +01:00
parent f9b592dfd5 ac882d2ff2
commit 1f7ad78e25
74 changed files with 886 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
View File

@@ -215,6 +215,7 @@ void ParamsEdited::set (bool v)
wb.green = v;
wb.temperature = v;
wb.equal = v;
wb.tempBias = v;
//colorShift.a = v;
//colorShift.b = v;
//lumaDenoise.enabled = v;
@@ -781,6 +782,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
wb.green = wb.green && p.wb.green == other.wb.green;
wb.equal = wb.equal && p.wb.equal == other.wb.equal;
wb.temperature = wb.temperature && p.wb.temperature == other.wb.temperature;
wb.tempBias = wb.tempBias && p.wb.tempBias == other.wb.tempBias;
//colorShift.a = colorShift.a && p.colorShift.a == other.colorShift.a;
//colorShift.b = colorShift.b && p.colorShift.b == other.colorShift.b;
//lumaDenoise.enabled = lumaDenoise.enabled && p.lumaDenoise.enabled == other.lumaDenoise.enabled;
@@ -1732,6 +1734,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.wb.equal = dontforceSet && options.baBehav[ADDSET_WB_EQUAL] ? toEdit.wb.equal + mods.wb.equal : mods.wb.equal;
}
if (wb.tempBias) {
toEdit.wb.tempBias = dontforceSet && options.baBehav[ADDSET_WB_TEMPBIAS] ? toEdit.wb.tempBias + mods.wb.tempBias : mods.wb.tempBias;
}
if (wb.green) {
toEdit.wb.green = dontforceSet && options.baBehav[ADDSET_WB_GREEN] ? toEdit.wb.green + mods.wb.green : mods.wb.green;
}