diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 21:26:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 21:26:15 +0400 |
| commit | 245a9db713e37becc87a9285a905458a2d9b380d (patch) | |
| tree | 654a5bc11f750fdb3fa2f791c8dce35d0c83b858 /release/scripts/startup | |
| parent | fdc3b7dfefbd980c8606a3a2639fbceaeb52cb13 (diff) | |
patch [#34687] Patch for AutoMerge button in 3d editor
from Dan McGrath (dmcgrath)
Diffstat (limited to 'release/scripts/startup')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 05acc26c011..5ad633069f4 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -111,6 +111,11 @@ class VIEW3D_HT_header(Header): elif snap_element == 'FACE': row.prop(toolsettings, "use_snap_project", text="") + # AutoMerge editing + if obj: + if (mode == 'EDIT' and obj.type == 'MESH'): + layout.prop(toolsettings, "use_mesh_automerge", text="", icon='AUTOMERGE_ON') + # OpenGL render row = layout.row(align=True) row.operator("render.opengl", text="", icon='RENDER_STILL') |