diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 22:16:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 22:16:50 +0300 |
commit | 94e0abda7504d85cc7a446f8d516faf345a8fbe6 (patch) | |
tree | f78212679f1f95eb2fa6a8add8a2e28c3ee43b07 /release/scripts | |
parent | 81f24dd781d99a60a736c3155eb53704ef1ca63e (diff) |
UI: move auto-merge option to mesh options panel
This can be used even w/o snap.
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 5 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 |
3 files changed, 4 insertions, 6 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" diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c97ae9b7eea..6204d38c0f1 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -173,7 +173,8 @@ class VIEW3D_HT_header(Header): text="" ) - layout.prop(scene, "transform_orientation", text="") + if mode in {'OBJECT', 'EDIT', 'POSE'}: + layout.prop(scene, "transform_orientation", text="") layout.separator() 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 **************** |