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

merge with devv

Browse Source
This commit is contained in:
Desmis
2017-07-13 08:42:08 +02:00
parent 4f7d310eb2 14f5d52304
commit 4c7287574d
30 changed files with 178 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/partialpastedlg.cc
View File

@@ -699,9 +699,6 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
// the general section is always ignored, whichever operation we use the PartialPaste for
filterPE.general = falsePE.general;
// raw.caAutoStrength is ignored at the moment.
filterPE.raw.caAutoStrength = false;
// Now we filter out the filter depending on the checked items
if (!wb->get_active ()) {
@@ -904,6 +901,7 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
filterPE.raw.bayersensor.pixelShiftBlur = falsePE.raw.bayersensor.pixelShiftBlur;
filterPE.raw.bayersensor.pixelShiftEperIso = falsePE.raw.bayersensor.pixelShiftEperIso;
filterPE.raw.bayersensor.pixelShiftEqualBright = falsePE.raw.bayersensor.pixelShiftEqualBright;
filterPE.raw.bayersensor.pixelShiftEqualBrightChannel = falsePE.raw.bayersensor.pixelShiftEqualBrightChannel;
filterPE.raw.bayersensor.pixelShiftExp0 = falsePE.raw.bayersensor.pixelShiftExp0;
filterPE.raw.bayersensor.pixelShiftGreen = falsePE.raw.bayersensor.pixelShiftGreen;
filterPE.raw.bayersensor.pixelShiftHoleFill = falsePE.raw.bayersensor.pixelShiftHoleFill;