diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2020-01-29 18:26:19 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2020-01-29 18:26:19 +0300 |
commit | e3f89237feccf710e34a9bd316e4c0557ad79055 (patch) | |
tree | 5cf654b6e5e569dfef8d823cdb16bf2c84384719 | |
parent | 9cb7ecefceee9f1751c3794d54ad1aa3f477f0aa (diff) |
Fix T73453: Selecting playhead in VSE deselects all selected strips
Tool system handlers had higher priority than the overlayed animation
"regions" (fake regions in fact). Give animation (and View2D) handlers
priority over toolsystem handlers.
Gizmo's still have higher priority, but I'll leave that unless there's a
reason to change.
-rw-r--r-- | source/blender/editors/screen/area.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index cb0be6f56ac..7db634660af 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1622,11 +1622,6 @@ static void ed_default_handlers( WM_gizmomap_add_handlers(ar, ar->gizmo_map); } } - if (flag & ED_KEYMAP_TOOL) { - WM_event_add_keymap_handler_dynamic( - &ar->handlers, WM_event_get_keymap_from_toolsystem_fallback, sa); - WM_event_add_keymap_handler_dynamic(&ar->handlers, WM_event_get_keymap_from_toolsystem, sa); - } if (flag & ED_KEYMAP_VIEW2D) { /* 2d-viewport handling+manipulation */ wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "View2D", 0, 0); @@ -1647,6 +1642,11 @@ static void ed_default_handlers( keymap = WM_keymap_ensure(wm->defaultconf, "Animation", 0, 0); WM_event_add_keymap_handler(handlers, keymap); } + if (flag & ED_KEYMAP_TOOL) { + WM_event_add_keymap_handler_dynamic( + &ar->handlers, WM_event_get_keymap_from_toolsystem_fallback, sa); + WM_event_add_keymap_handler_dynamic(&ar->handlers, WM_event_get_keymap_from_toolsystem, sa); + } if (flag & ED_KEYMAP_FRAMES) { /* frame changing/jumping (for all spaces) */ wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Frames", 0, 0); |