[Bf-blender-cvs] [e3f89237fec] master: Fix T73453: Selecting playhead in VSE deselects all selected strips

Julian Eisel noreply at git.blender.org
Wed Jan 29 16:30:32 CET 2020


Commit: e3f89237feccf710e34a9bd316e4c0557ad79055
Author: Julian Eisel
Date:   Wed Jan 29 16:26:19 2020 +0100
Branches: master
https://developer.blender.org/rBe3f89237feccf710e34a9bd316e4c0557ad79055

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.

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

M	source/blender/editors/screen/area.c

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

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);



More information about the Bf-blender-cvs mailing list