merge with dev

2017-12-18 15:50:15 +01:00
parent 3c0d0ca9a0 d1d91869c8
commit 17239849c3
10 changed files with 65 additions and 25 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -100,6 +100,7 @@ public:
 class LCurveParamsEdited
 {
 public:
+    bool enabled;
    bool brightness;
    bool contrast;
    bool chromaticity;
@@ -115,8 +116,6 @@ public:
    bool hhcurve;
    bool lccurve;
    bool clcurve;
-    bool enabled;
-    bool method;
 };

 class RGBCurvesParamsEdited