Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2018 06:02:50 +0000 (08:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2018 06:02:50 +0000 (08:02 +0200)
source/blender/editors/interface/interface_handlers.c

index 117483641724420231e8f90c1209ce18b24ce1ef..b05dbe9c3b0ebf295d1fde3259aaa5ac331896d8 100644 (file)
@@ -3594,7 +3594,7 @@ static int ui_do_but_BUT(
                        button_activate_state(C, but, BUTTON_STATE_WAIT_RELEASE);
                        return WM_UI_HANDLER_BREAK;
                }
-               else if (event->type == LEFTMOUSE && but->block->handle) {
+               else if (event->type == LEFTMOUSE && event->val == KM_RELEASE && but->block->handle) {
                        /* regular buttons will be 'UI_SELECT', menu items 'UI_ACTIVE' */
                        if (!(but->flag & (UI_SELECT | UI_ACTIVE)))
                                data->cancel = true;