merge with dev

2017-06-27 10:28:35 +02:00
parent acd715dd44 0ecb02afdd
commit dfffa2e8aa
45 changed files with 1074 additions and 400 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -321,7 +321,6 @@ public:
    bool enabled;
    bool enhance;
    bool median;
-    bool autochroma;
    bool Ldetail;
    bool luma;
    bool chroma;
@@ -617,7 +616,6 @@ public:
    bool applyLookTable;
    bool applyBaselineExposureOffset;
    bool applyHueSatMap;
-    bool blendCMSMatrix;
    bool dcpIlluminant;
    bool working;
    bool output;