merge with devv

2017-07-13 08:42:08 +02:00
parent 4f7d310eb2 14f5d52304
commit 4c7287574d
30 changed files with 178 additions and 319 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -67,7 +67,6 @@ public:
    bool gam;
    bool slope;
    bool neigh;
-    bool gain;
    bool offs;
    bool retinexMethod;
    bool mapMethod;
@@ -823,7 +822,6 @@ public:
    XTransSensor xtranssensor;

    bool caCorrection;
-    bool caAutoStrength;
    bool caRed;
    bool caBlue;
    bool hotPixelFilter;