diff options
author | William Reynish <billrey@me.com> | 2019-05-02 14:50:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-02 14:57:24 +0300 |
commit | a914765221fb370244998c805f0750c2370fbfe4 (patch) | |
tree | b1d99d8f4c488959c4cf15baea444402183d98a6 | |
parent | 6047653ec04efbc556506adad835cc83eb4c7dcf (diff) |
UI: rename 'Remove Doubles' to 'Merge by Distance'
Also add into the "Merge" menu.
4 files changed, 20 insertions, 8 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 844e5d335e6..45c082feee9 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -3935,7 +3935,7 @@ def km_mesh(params): ("mesh.rip_move", {"type": 'V', "value": 'PRESS', "alt": True}, {"properties": [("MESH_OT_rip", [("use_fill", True), ],)]}), ("mesh.rip_edge_move", {"type": 'D', "value": 'PRESS', "alt": True}, None), - ("mesh.merge", {"type": 'M', "value": 'PRESS', "alt": True}, None), + op_menu("VIEW3D_MT_edit_mesh_merge", {"type": 'M', "value": 'PRESS', "alt": True}), ("transform.shrink_fatten", {"type": 'S', "value": 'PRESS', "alt": True}, None), ("mesh.edge_face_add", {"type": 'F', "value": 'PRESS'}, None), ("mesh.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None), diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c6674bf34d1..8c9a1f86cb1 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3358,8 +3358,7 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu): # Removal Operators if selected_verts_len > 1: - col.operator_menu_enum("mesh.merge", "type", text="Merge Vertices") - col.operator("mesh.remove_doubles", text="Remove Double Vertices") + col.menu("VIEW3D_MT_edit_mesh_merge", text="Merge Vertices") col.operator("mesh.dissolve_verts") col.operator("mesh.delete", text="Delete Vertices").type = 'VERT' @@ -3562,8 +3561,7 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): layout.separator() - layout.operator_menu_enum("mesh.merge", "type", text="Merge Vertices") - layout.operator("mesh.remove_doubles", text="Remove Double Vertices") + layout.menu("VIEW3D_MT_edit_mesh_merge", text="Merge Vertices") layout.separator() @@ -3852,6 +3850,19 @@ class VIEW3D_MT_edit_mesh_delete(Menu): layout.operator("mesh.delete_edgeloop", text="Edge Loops") +class VIEW3D_MT_edit_mesh_merge(Menu): + bl_label = "Merge" + + def draw(self, _context): + layout = self.layout + + layout.operator_enum("mesh.merge", "type") + + layout.separator() + + layout.operator("mesh.remove_doubles", text="By Distance") + + class VIEW3D_MT_edit_mesh_showhide(ShowHideMenu, Menu): _operator_name = "mesh" @@ -6419,6 +6430,7 @@ classes = ( VIEW3D_MT_edit_mesh_weights, VIEW3D_MT_edit_mesh_clean, VIEW3D_MT_edit_mesh_delete, + VIEW3D_MT_edit_mesh_merge, VIEW3D_MT_edit_mesh_showhide, VIEW3D_MT_paint_gpencil, VIEW3D_MT_assign_material, diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 7d9bb4230c9..cd9d046ae04 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3169,8 +3169,8 @@ static int edbm_remove_doubles_exec(bContext *C, wmOperator *op) void MESH_OT_remove_doubles(wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove Doubles"; - ot->description = "Remove duplicate vertices"; + ot->name = "Merge by Distance"; + ot->description = "Merge vertices based on their proximity"; ot->idname = "MESH_OT_remove_doubles"; /* api callbacks */ diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 7de609a3559..30ded60bd84 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -2203,7 +2203,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op) static void UV_OT_remove_doubles(wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove Doubles UV"; + ot->name = "Merge UVs by Distance"; ot->description = "Selected UV vertices that are within a radius of each other are welded together"; ot->idname = "UV_OT_remove_doubles"; |