Merge branch 'dev' into relax-procparam-dependency

2019-03-10 12:54:04 +01:00
parent 3074803688 d89364fcc0
commit 9fe6bcaab1
24 changed files with 281 additions and 148 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -628,6 +628,7 @@ struct RAWParamsEdited {
        bool method;
        bool dualDemosaicAutoContrast;
        bool dualDemosaicContrast;
+        bool border;
        bool ccSteps;
        bool exBlackRed;
        bool exBlackGreen;