From 5417b8434a22011f8b8ae7578f6e5c004b85267f Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 27 May 2022 12:45:35 +0200 Subject: Fix T97918: Crash when changing "Frame All" shortcut from context menu After removing the default 'Home' shortcut for "Frame All", a NDOF (3D Mouse) default shortcut was still available for the operator. The event filtering introduced in 4357fb63db77 was missing the NDOF filtering logic. So while the context menu correctly found the NDOF keymap item, its actual shortcut change/removal code incorrectly filtered out the NDOF keymap items and thus failed to find the item. --- source/blender/windowmanager/intern/wm_event_query.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source') diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c index 503dae53122..b732bc91569 100644 --- a/source/blender/windowmanager/intern/wm_event_query.c +++ b/source/blender/windowmanager/intern/wm_event_query.c @@ -199,6 +199,13 @@ bool WM_event_type_mask_test(const int event_type, const enum eEventType_Mask ma } } + /* NDOF */ + if (mask & EVT_TYPE_MASK_NDOF) { + if (ISNDOF(event_type)) { + return true; + } + } + /* Action Zone. */ if (mask & EVT_TYPE_MASK_ACTIONZONE) { if (IS_EVENT_ACTIONZONE(event_type)) { -- cgit v1.2.3