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.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -679,6 +679,16 @@ void ToolPanelCoordinator::spotWBselected(int x, int y, Thumbnail* thm)
    }
 }

+void ToolPanelCoordinator::sharpMaskSelected(bool sharpMask)
+{
+
+    if (!ipc) {
+        return;
+    }
+    ipc->beginUpdateParams ();
+    ipc->setSharpMask(sharpMask);
+    ipc->endUpdateParams (rtengine::EvShrEnabled);
+}