merge with dev

2017-12-13 08:42:13 +01:00
parent 3b54fa6dc3 48cc4511cc
commit caafa4729a
53 changed files with 645 additions and 375 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -123,6 +123,7 @@ class RGBCurvesParamsEdited
 {

 public:
+    bool enabled;
    bool lumamode;
    bool rcurve;
    bool gcurve;
@@ -229,6 +230,7 @@ class WBParamsEdited
 {

 public:
+    bool enabled;
    bool method;
    bool temperature;
    bool green;
@@ -598,6 +600,7 @@ class ChannelMixerParamsEdited
 {

 public:
+    bool enabled;
    bool red[3];
    bool green[3];
    bool blue[3];
@@ -788,6 +791,7 @@ class HSVEqualizerParamsEdited
 {

 public:
+    bool enabled;
    bool hcurve;
    bool scurve;
    bool vcurve;