[Bf-blender-cvs] [c8995ec] master: Fix inbetween mousemove event getting detected in hotkey buttons.

[Brecht Van Lommel]

Commit: c8995ecc835d6fa7093bd76dd4ba031ac27465bd
Author: Brecht Van Lommel
Date:   Sat Dec 6 02:27:13 2014 +0100
Branches: master
https://developer.blender.org/rBc8995ecc835d6fa7093bd76dd4ba031ac27465bd

Fix inbetween mousemove event getting detected in hotkey buttons.

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index c841370..3a31280 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -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) {