diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:02:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:02:50 +0300 |
| commit | d352a0adc5dadd0bfdc3b1b1ac76d92be689966b (patch) | |
| tree | 2aba05b664bf80e9f63468af35e99edff0405c86 /source | |
| parent | 8b5ce6e843eae4d379403986472475732f94e758 (diff) | |
| parent | 009c38df5303f0a32eed2962650b89ebd6ae2e46 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 11748364172..b05dbe9c3b0 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -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; |