diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-12-28 19:39:12 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2021-01-05 12:02:03 +0300 |
commit | 7d152bedc5f172d77915d1377f0a8ca3a627e583 (patch) | |
tree | 7f29671144e5ab0943ac4a2f0f6ce674eb01a71f | |
parent | 08f00f4f6ef1cc71521aa29246de1f778fd8da3b (diff) |
Fix T84216: Drawing a paintcurve [vertexpaint / weightpaint] fails
Caused by rB35e3dc9192e7.
Above commit moved 'Weight Paint' & 'Vertex Paint' keymap also before
'Paint Curve' keymap.
This way, paintcurve.add_point_slide would be overriden by:
- paint.vertex_paint (inverted)
- paint.weight_sample
Now move 'Paint Curve' above again.
Reviewers: campbellbarton
Maniphest Tasks: T84216
Differential Revision: https://developer.blender.org/D9939
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 3761f4ad7c6..82a20451d26 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -392,6 +392,10 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *region) keymap = WM_keymap_ensure(wm->defaultconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0); WM_event_add_keymap_handler(®ion->handlers, keymap); + /* Before 'Weight/Vertex Paint' so adding curve points is not overriden. */ + keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0); + WM_event_add_keymap_handler(®ion->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(®ion->handlers, keymap); @@ -406,9 +410,6 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *region) keymap = WM_keymap_ensure(wm->defaultconf, "Object Mode", 0, 0); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0); - WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Curve", 0, 0); WM_event_add_keymap_handler(®ion->handlers, keymap); |