blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix inbetween mousemove event getting detected in hotkey buttons.

This commit is contained in:
Brecht Van Lommel 2014-12-06 02:27:13 +01:00
parent 871cf70144
commit c8995ecc83
Notes: blender-bot 2023-06-21 19:23:24 +02:00 
Referenced by issue #42905, Dupliface relies on vertex order of the face, rather then the face normal
Referenced by issue #42864, Knife Project bad precision
Referenced by issue #42844, Compositor scale offset
Referenced by issue #42828, Unable to select objects in wireframe mode
Referenced by issue #42834, Scaling in global axis does not work correctly if the object has rotation
Referenced by issue #42837, Sculpt lagging after restarting blender with VBO set
Referenced by issue #42815, Sampling differences between Path and Branched integrators
Referenced by issue #42822, constraint transform dont use local axis
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3063,10 +3063,10 @@ static int ui_do_but_HOTKEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data
}
}
else if (data->state == BUTTON_STATE_WAIT_KEY_EVENT) {
if (event->type == MOUSEMOVE)
if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) {
return WM_UI_HANDLER_CONTINUE;
}
if (event->type == LEFTMOUSE && event->val == KM_PRESS) {
/* only cancel if click outside the button */
if (ui_but_contains_point_px(but->active->region, but, event->x, event->y) == 0) {