[Bf-blender-cvs] [46b126a2c84] master: UI: Small changes to bevel active tool layout

[Hans Goudey]

Commit: 46b126a2c8402a527cd611b47d04ee7de29a9775
Author: Hans Goudey
Date:   Tue Jul 21 16:47:58 2020 -0400
Branches: master
https://developer.blender.org/rB46b126a2c8402a527cd611b47d04ee7de29a9775

UI: Small changes to bevel active tool layout

 - Exposes affect enum in the header instead of profile type.
 - Add two missing options from the operator

===================================================================

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 2b35eb15cdc..818130976d3 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -751,15 +751,15 @@ class _defs_edit_mesh:
                     layout.prop(props, "offset_type", text="")
                 else:
                     layout.row().prop(props, "affect", expand=True)
-
+                    layout.separator()
                     layout.prop(props, "offset_type")
 
                 layout.prop(props, "segments")
 
-                row = layout.row()
-                row.prop(props, "profile_type", text="" if region_is_header else None)
-                if props.profile_type == 'SUPERELLIPSE':
-                    layout.prop(props, "profile", text="Shape", slider=True)
+                if region_is_header:
+                    layout.prop(props, "affect", text="")
+
+                layout.prop(props, "profile", text="Shape", slider=True)
 
                 if region_is_header:
                     layout.popover("TOPBAR_PT_tool_settings_extra", text="...")
@@ -770,14 +770,6 @@ class _defs_edit_mesh:
                 layout.use_property_split = True
                 layout.use_property_decorate = False
 
-                if region_is_header:
-                    layout.row().prop(props, "affect", expand=True)
-
-                if props.profile_type == 'CUSTOM':
-                    col = layout.column()
-                    col.active = edge_bevel
-                    col.prop(props, "profile", text="Miter Shape", slider=True)
-
                 layout.prop(props, "material")
 
                 col = layout.column()
@@ -798,6 +790,16 @@ class _defs_edit_mesh:
                 if props.miter_inner == 'ARC':
                     col.prop(props, "spread")
 
+                layout.separator()
+
+                col = layout.column()
+                col.active = edge_bevel
+                col.prop(props, "vmesh_method", text="Intersections")
+
+                layout.prop(props, "face_strength_mode", text="Face Strength")
+
+                layout.prop(props, "profile_type")
+
                 if props.profile_type == 'CUSTOM':
                     tool_settings = context.tool_settings
                     layout.template_curveprofile(tool_settings, "custom_bevel_profile_preset")