merge master into retinexgain

2016-05-01 08:53:52 +02:00
parent 67a19d0cc9 c8db56643a
commit a742e3a7ba
221 changed files with 7954 additions and 6498 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -648,7 +648,7 @@ public:
    bool enabled;
    bool gamutlab;
    bool mult[6];
-
+    bool cbdlMethod;
    bool threshold;
    bool skinprotect;
    bool hueskin;
@@ -714,6 +714,7 @@ public:
    XTransSensor xtranssensor;

    bool caCorrection;
+    bool caAutoStrength;
    bool caRed;
    bool caBlue;
    bool hotPixelFilter;