Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-12 22:16:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-12 22:16:50 +0300
commit94e0abda7504d85cc7a446f8d516faf345a8fbe6 (patch)
treef78212679f1f95eb2fa6a8add8a2e28c3ee43b07 /release/scripts/startup/bl_ui/space_topbar.py
parent81f24dd781d99a60a736c3155eb53704ef1ca63e (diff)
UI: move auto-merge option to mesh options panel
This can be used even w/o snap.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_topbar.py')
-rw-r--r--release/scripts/startup/bl_ui/space_topbar.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 54a68971612..a88e8164436 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -269,11 +269,6 @@ class TOPBAR_PT_snapping(Panel):
if 'VOLUME' in snap_elements:
col.prop(toolsettings, "use_snap_peel_object")
- # Auto-Merge Editing
- if obj:
- if (object_mode == 'EDIT' and obj.type == 'MESH'):
- col.prop(toolsettings, "use_mesh_automerge", icon='AUTOMERGE_ON')
-
class INFO_MT_editor_menus(Menu):
bl_idname = "INFO_MT_editor_menus"