From 4952fb1669fb7d254fc26a527b6dc2a44ac2c496 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Mon, 10 Feb 2020 12:13:55 +0100 Subject: Fix T54323: Improve Paint category names in keymap preferences While one issue of the report was fixed already (rB27adc4aa3347), still a couple of clarifications could be made: - correct/clarify which modes these apply to - clarify that "Face Mask" is a paint thing Maniphest Tasks: T54323 Differential Revision: https://developer.blender.org/D6797 --- release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py | 4 ++-- release/scripts/presets/keyconfig/keymap_data/blender_default.py | 4 ++-- .../scripts/presets/keyconfig/keymap_data/industry_compatible_data.py | 4 ++-- source/blender/editors/sculpt_paint/paint_ops.c | 4 ++-- source/blender/editors/space_view3d/space_view3d.c | 4 ++-- source/blender/windowmanager/intern/wm_keymap_utils.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py b/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py index a98fa2c1fa8..35b5f217247 100644 --- a/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py +++ b/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py @@ -95,8 +95,8 @@ _km_hierarchy = [ ('Weight Paint', 'EMPTY', 'WINDOW', [ _km_expand_from_toolsystem('VIEW_3D', 'PAINT_WEIGHT'), ]), - ('Weight Paint Vertex Selection', 'EMPTY', 'WINDOW', []), - ('Face Mask', 'EMPTY', 'WINDOW', []), + ('Paint Vertex Selection (Weight, Vertex)', 'EMPTY', 'WINDOW', []), + ('Paint Face Mask (Weight, Vertex, Texture)', 'EMPTY', 'WINDOW', []), # image and view3d ('Image Paint', 'EMPTY', 'WINDOW', [ _km_expand_from_toolsystem('VIEW_3D', 'PAINT_TEXTURE'), diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 6d67c02a49c..aa061060ef9 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -3380,7 +3380,7 @@ def km_grease_pencil_stroke_weight_mode(_params): def km_face_mask(params): items = [] keymap = ( - "Face Mask", + "Paint Face Mask (Weight, Vertex, Texture)", {"space_type": 'EMPTY', "region_type": 'WINDOW'}, {"items": items}, ) @@ -3405,7 +3405,7 @@ def km_face_mask(params): def km_weight_paint_vertex_selection(params): items = [] keymap = ( - "Weight Paint Vertex Selection", + "Paint Vertex Selection (Weight, Vertex)", {"space_type": 'EMPTY', "region_type": 'WINDOW'}, {"items": items}, ) diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 0195232a59d..b0b7c542df3 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -2531,7 +2531,7 @@ def km_grease_pencil_stroke_weight_mode(params): def km_face_mask(params): items = [] keymap = ( - "Face Mask", + "Paint Face Mask (Weight, Vertex, Texture)", {"space_type": 'EMPTY', "region_type": 'WINDOW'}, {"items": items}, ) @@ -2558,7 +2558,7 @@ def km_face_mask(params): def km_weight_paint_vertex_selection(params): items = [] keymap = ( - "Weight Paint Vertex Selection", + "Paint Vertex Selection (Weight, Vertex)", {"space_type": 'EMPTY', "region_type": 'WINDOW'}, {"items": items}, ) diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 8c8fc412663..e58183bfc0f 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -1062,7 +1062,7 @@ void ED_keymap_paint(wmKeyConfig *keyconf) keymap->poll = weight_paint_mode_poll; /*Weight paint's Vertex Selection Mode */ - keymap = WM_keymap_ensure(keyconf, "Weight Paint Vertex Selection", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0); keymap->poll = vert_paint_poll; /* Image/Texture Paint mode */ @@ -1070,7 +1070,7 @@ void ED_keymap_paint(wmKeyConfig *keyconf) keymap->poll = image_texture_paint_poll; /* face-mask mode */ - keymap = WM_keymap_ensure(keyconf, "Face Mask", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Paint Face Mask (Weight, Vertex, Texture)", 0, 0); keymap->poll = facemask_paint_poll; /* paint stroke */ diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 9d84309d222..df743415fec 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -361,10 +361,10 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar) /* object ops. */ /* important to be before Pose keymap since they can both be enabled at once */ - keymap = WM_keymap_ensure(wm->defaultconf, "Face Mask", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Paint Face Mask (Weight, Vertex, Texture)", 0, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Weight Paint Vertex Selection", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); /* Before 'Pose' so weight paint menus aren't overridden by pose menus. */ diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.c b/source/blender/windowmanager/intern/wm_keymap_utils.c index 4603f14729d..5e6b55a508e 100644 --- a/source/blender/windowmanager/intern/wm_keymap_utils.c +++ b/source/blender/windowmanager/intern/wm_keymap_utils.c @@ -318,7 +318,7 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) } /* Paint Face Mask */ else if (STRPREFIX(opname, "PAINT_OT_face_select")) { - km = WM_keymap_find_all(C, "Face Mask", 0, 0); + km = WM_keymap_find_all(C, "Paint Face Mask (Weight, Vertex, Texture)", 0, 0); } else if (STRPREFIX(opname, "PAINT_OT")) { /* check for relevant mode */ -- cgit v1.2.3