Merge branch 'dev' into rtsurface-cleanup

2019-03-25 19:09:15 +01:00
parent 363385a838 14020ed356
commit fc10dc5f77
105 changed files with 5860 additions and 2805 deletions
--- a/rtgui/myflatcurve.cc
+++ b/rtgui/myflatcurve.cc
@@ -22,7 +22,7 @@

 #include "myflatcurve.h"

-#include "edit.h"
+#include "editcallbacks.h"

 #include "../rtengine/curves.h"

@@ -1213,9 +1213,9 @@ void MyFlatCurve::pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider,
        return;
    }

-    pipetteR = provider->pipetteVal[0];
-    pipetteG = provider->pipetteVal[1];
-    pipetteB = provider->pipetteVal[2];
+    pipetteR = provider->getPipetteVal1();
+    pipetteG = provider->getPipetteVal2();
+    pipetteB = provider->getPipetteVal3();
    pipetteVal = 0.f;

    if (listener) {