merge with dev..

2018-06-14 09:06:29 +02:00
parent 03fb04cd81 e3cb9130a1
commit c1463c7edd
87 changed files with 1674 additions and 790 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -285,6 +285,7 @@ public:

    // imageareatoollistener interface
    void spotWBselected(int x, int y, Thumbnail* thm = nullptr);
+    void sharpMaskSelected (bool sharpMask);
    void cropSelectionReady();
    void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr);
    ToolBar* getToolBar()