From 508e33842b033017dd0d9b5215b16bef037e5f7e Mon Sep 17 00:00:00 2001
From: Germano Cavalcante <germano.costa@ig.com.br>
Date: Mon, 22 Jun 2020 09:20:43 -0300
Subject: Tools: rename 'Extrude, Dissolve and Intersect' to 'Extrude Manifold'

---
 release/scripts/presets/keyconfig/keymap_data/blender_default.py | 8 ++++----
 release/scripts/startup/bl_operators/view3d.py                   | 2 +-
 release/scripts/startup/bl_ui/space_toolsystem_toolbar.py        | 8 ++++----
 source/blender/editors/mesh/mesh_ops.c                           | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index a441fdb0dd4..68340443a78 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5909,12 +5909,12 @@ def km_3d_view_tool_edit_mesh_extrude_region(params):
         ]},
     )
 
-def km_3d_view_tool_edit_mesh_extrude_dissolve_and_intersect(params):
+def km_3d_view_tool_edit_mesh_extrude_manifold(params):
     return (
-        "3D View Tool: Edit Mesh, Extrude Dissolve and Intersect",
+        "3D View Tool: Edit Mesh, Extrude Manifold",
         {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
         {"items": [
-            ("mesh.extrude_region_dissolve_move_intersect", {"type": params.tool_tweak, "value": 'ANY'},
+            ("mesh.extrude_manifold", {"type": params.tool_tweak, "value": 'ANY'},
              {"properties": [
                  ("MESH_OT_extrude_region", [("use_dissolve_ortho_edges", True)]),
                  ("TRANSFORM_OT_translate", [
@@ -6787,7 +6787,7 @@ def generate_keymaps(params=None):
         km_3d_view_tool_edit_armature_extrude(params),
         km_3d_view_tool_edit_armature_extrude_to_cursor(params),
         km_3d_view_tool_edit_mesh_extrude_region(params),
-        km_3d_view_tool_edit_mesh_extrude_dissolve_and_intersect(params),
+        km_3d_view_tool_edit_mesh_extrude_manifold(params),
         km_3d_view_tool_edit_mesh_extrude_along_normals(params),
         km_3d_view_tool_edit_mesh_extrude_individual(params),
         km_3d_view_tool_edit_mesh_extrude_to_cursor(params),
diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py
index 88fa06a913f..a8e04eb2f24 100644
--- a/release/scripts/startup/bl_operators/view3d.py
+++ b/release/scripts/startup/bl_operators/view3d.py
@@ -98,7 +98,7 @@ class VIEW3D_OT_edit_mesh_extrude_move(Operator):
                     TRANSFORM_OT_shrink_fatten={},
                 )
             elif dissolve_and_intersect:
-                bpy.ops.mesh.extrude_region_dissolve_move_intersect(
+                bpy.ops.mesh.extrude_manifold(
                     'INVOKE_REGION_WIN',
                     MESH_OT_extrude_region={
                         "use_dissolve_ortho_edges": True,
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 2c3108e0a11..9f26abec805 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -802,10 +802,10 @@ class _defs_edit_mesh:
         )
 
     @ToolDef.from_fn
-    def extrude_dissolve_and_intersect():
+    def extrude_manifold():
         return dict(
-            idname="builtin.extrude_dissolve_and_intersect",
-            label="Extrude Dissolve and Intersect",
+            idname="builtin.extrude_manifold",
+            label="Extrude Manifold",
             description=(
                 "Extrude, dissolves edges whose faces form a flat surface and intersect new edges"
             ),
@@ -2327,7 +2327,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             None,
             (
                 _defs_edit_mesh.extrude,
-                _defs_edit_mesh.extrude_dissolve_and_intersect,
+                _defs_edit_mesh.extrude_manifold,
                 _defs_edit_mesh.extrude_normals,
                 _defs_edit_mesh.extrude_individual,
                 _defs_edit_mesh.extrude_cursor,
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index c52a5956ac4..e10c1286dac 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -278,8 +278,8 @@ void ED_operatormacros_mesh(void)
   RNA_boolean_set(otmacro->ptr, "mirror", false);
 
   ot = WM_operatortype_append_macro(
-      "MESH_OT_extrude_region_dissolve_move_intersect",
-      "Extrude, Dissolve, Move and Intersect",
+      "MESH_OT_extrude_manifold",
+      "Extrude Manifold",
       "Extrude, dissolves edges whose faces form a flat surface and intersect new edges",
       OPTYPE_UNDO | OPTYPE_REGISTER);
   otmacro = WM_operatortype_macro_define(ot, "MESH_OT_extrude_region");
-- 
cgit v1.2.3