sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2018-06-08 08:02:50 +02:00
commit d352a0adc5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface_handlers.c
View File

@ -3594,7 +3594,7 @@ static int ui_do_but_BUT(
button_activate_state(C, but, BUTTON_STATE_WAIT_RELEASE); button_activate_state(C, but, BUTTON_STATE_WAIT_RELEASE);
return WM_UI_HANDLER_BREAK; 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' */ /* regular buttons will be 'UI_SELECT', menu items 'UI_ACTIVE' */
if (!(but->flag & (UI_SELECT | UI_ACTIVE))) if (!(but->flag & (UI_SELECT | UI_ACTIVE)))
data->cancel = true; data->cancel = true;