Merge branch 'master' into gtk3

2016-03-13 20:04:57 +01:00
parent 3a594bafa3 b0bfe48723
commit cf7a175d74
14 changed files with 42 additions and 23 deletions
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -623,6 +623,8 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y)
    if (state != SEditDrag3 && state != SEditPick3 && button == 3 && !(bstate & (GDK_SHIFT_MASK|GDK_CONTROL_MASK))) {
        iarea->pipetteVal[0] = iarea->pipetteVal[1] = iarea->pipetteVal[2] = -1.f;

+        needRedraw = iarea->object == 1;
+
        if (editSubscriber && editSubscriber->getEditingType() == ET_PIPETTE) {
            editSubscriber->mouseOver(0);
        }