Commit: a757065875e453fca402e776698e7c10b537e076
Author: Julian Eisel
Date: Wed Nov 23 02:26:43 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBa757065875e453fca402e776698e7c10b537e076
Fix KM_CLICK events broken
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c
b/source/blender/windowmanager/intern/wm_event_system.c
index b5c8c83..94ff3aa 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2149,7 +2149,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event,
ListBase *handlers)
if (CTX_wm_window(C) == NULL)
return action;
- if (!ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE, EVENT_NONE) &&
!ISTIMER(event->type)) {
+ if (!ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE, EVENT_NONE,
EVT_HMD_TRANSFORM) && !ISTIMER(event->type)) {
/* test for CLICK events */
if (wm_action_not_handled(action)) {
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 4633bc6..4c0fadf 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4245,7 +4245,7 @@ static int hmd_session_refresh_invoke(bContext *C,
wmOperator *UNUSED(op), const
wmWindow *hmd_win = wm->hmd_view.hmd_win;
if (!hmd_win || !hmd_win->screen->is_hmd_running) {
- return OPERATOR_CANCELLED; /* no pass through, we don't need to
keep that event in queue */
+ return OPERATOR_CANCELLED;
}
ScrArea *sa = hmd_win->screen->areabase.first;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
