merge with dev

2018-10-27 16:11:17 +02:00
parent 59339644de eee6837385
commit b50b8dea9f
211 changed files with 2968 additions and 1991 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -754,6 +754,7 @@ public:
        bool dcbIterations;
        bool dcbEnhance;
        bool lmmseIterations;
+        bool dualDemosaicAutoContrast;
        bool dualDemosaicContrast;
        bool pixelShiftMotionCorrectionMethod;
        bool pixelShiftEperIso;
@@ -784,6 +785,7 @@ public:

    public:
        bool method;
+        bool dualDemosaicAutoContrast;
        bool dualDemosaicContrast;
        bool ccSteps;
        bool exBlackRed;