Merge branch 'blender2.8' into soc-2018-bevel

2018-06-20 22:29:44 +05:30
parent dd752476b9 82dc5f91e8
commit c73a6b0d42
1136 changed files with 18688 additions and 16824 deletions
--- 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 ****************