diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-02-15 10:50:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-15 10:59:46 +0300 |
| commit | 35e3dc9192e73a4eb6772c2c02d628b69b4699a1 (patch) | |
| tree | 61e657ce3ba7aec5b9854707cb1fff0f6e3f2a42 /source/blender | |
| parent | 57511782cfcd3259e79c03ddc0066ee370691cf3 (diff) | |
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
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 13 |
1 files changed, 7 insertions, 6 deletions
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); |