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_view3d_toolbar.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_view3d_toolbar.py')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 1cacba82b3e..53947a7d8af 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -104,6 +104,8 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
col.prop(tool_settings, "edge_path_live_unwrap")
col.label("Double Threshold:")
col.prop(tool_settings, "double_threshold", text="")
+ col.prop(tool_settings, "use_mesh_automerge") # , icon='AUTOMERGE_ON'
+
# ********** default tools for editmode_curve ****************