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/rtengine/pipettebuffer.h
+++ b/rtengine/pipettebuffer.h
@@ -93,7 +93,7 @@ public:
    bool bufferCreated();

    // get the pipette values
-    void getPipetteData(float* v, int x, int y, int squareSize);
+    void getPipetteData(int x, int y, int squareSize);
 };

 }