[Bf-blender-cvs] [35e3dc9192e] master: Keymap: move weight & vertex paint handling before pose mode

[Campbell Barton]

Commit: 35e3dc9192e73a4eb6772c2c02d628b69b4699a1
Author: Campbell Barton
Date:   Sat Feb 15 18:50:52 2020 +1100
Branches: master
https://developer.blender.org/rB35e3dc9192e73a4eb6772c2c02d628b69b4699a1

Keymap: move weight & vertex paint handling before pose mode

This is needed so pose keymap doesn't override weight paint,
which currently prevents the weight paint context menu from showing.

Logically pose mode is secondary when used in combination with
weight paint, so evaluate it afterwards.

Also move vertex paint keymap since they have a lot in common,
it's simpler to keep them evaluated at the same place.

Resolves T73384

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

M	source/blender/editors/space_view3d/space_view3d.c

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

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 902df9ef89e..9d84309d222 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -367,6 +367,13 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar)
   keymap = WM_keymap_ensure(wm->defaultconf, "Weight Paint Vertex Selection", 0, 0);
   WM_event_add_keymap_handler(&ar->handlers, keymap);
 
+  /* Before 'Pose' so weight paint menus aren't overridden by pose menus. */
+  keymap = WM_keymap_ensure(wm->defaultconf, "Weight Paint", 0, 0);
+  WM_event_add_keymap_handler(&ar->handlers, keymap);
+
+  keymap = WM_keymap_ensure(wm->defaultconf, "Vertex Paint", 0, 0);
+  WM_event_add_keymap_handler(&ar->handlers, keymap);
+
   /* pose is not modal, operator poll checks for this */
   keymap = WM_keymap_ensure(wm->defaultconf, "Pose", 0, 0);
   WM_event_add_keymap_handler(&ar->handlers, keymap);
@@ -383,12 +390,6 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar)
   keymap = WM_keymap_ensure(wm->defaultconf, "Image Paint", 0, 0);
   WM_event_add_keymap_handler(&ar->handlers, keymap);
 
-  keymap = WM_keymap_ensure(wm->defaultconf, "Vertex Paint", 0, 0);
-  WM_event_add_keymap_handler(&ar->handlers, keymap);
-
-  keymap = WM_keymap_ensure(wm->defaultconf, "Weight Paint", 0, 0);
-  WM_event_add_keymap_handler(&ar->handlers, keymap);
-
   keymap = WM_keymap_ensure(wm->defaultconf, "Sculpt", 0, 0);
   WM_event_add_keymap_handler(&ar->handlers, keymap);