merge with dev

2019-03-26 08:33:23 +01:00
parent e1705ab94b
commit 2289fa8e94
2 changed files with 2 additions and 2 deletions
--- a/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -1388,7 +1388,7 @@ CursorShape ControlSpotPanel::getCursor(int objectID)
    }
 }

-const bool ControlSpotPanel::mouseOver(int modifierKey)
+bool ControlSpotPanel::mouseOver(int modifierKey)
 {
    EditDataProvider* editProvider_ = getEditProvider();
    const auto s = treeview_.get_selection();