[Bf-blender-cvs] [63db01cd58e] modifier-panels-ui: Bevel modifier layout update

[William Reynish]

Commit: 63db01cd58e70391dfe2564c2efbc00767e468a9
Author: William Reynish
Date:   Wed Apr 8 15:57:17 2020 +0200
Branches: modifier-panels-ui
https://developer.blender.org/rB63db01cd58e70391dfe2564c2efbc00767e468a9

Bevel modifier layout update

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

M	source/blender/modifiers/intern/MOD_bevel.c

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

diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index cd97414698a..d0c4819dcd8 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -289,8 +289,6 @@ static void panel_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiItemR(layout, &ptr, "affect", 0, NULL, ICON_NONE);
-
   col = uiLayoutColumn(layout, false);
   const char *offset_name = "";
   if (RNA_enum_get(&ptr, "offset_type") == BEVEL_AMT_PERCENT) {
@@ -315,19 +313,17 @@ static void panel_draw(const bContext *C, Panel *panel)
 
   uiItemS(layout);
 
+  uiItemR(layout, &ptr, "affect", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
   uiItemR(layout, &ptr, "segments", 0, NULL, ICON_NONE);
 
-  split = uiLayoutSplit(layout, 0.5f, true);
-  col = uiLayoutColumn(split, true);
-
+  col = uiLayoutColumn(layout, true);
   uiItemR(col, &ptr, "use_clamp_overlap", 0, NULL, ICON_NONE);
-  uiItemR(col, &ptr, "loop_slide", 0, NULL, ICON_NONE);
-
-  col = uiLayoutColumn(split, true);
-  uiItemR(col, &ptr, "mark_seam", 0, NULL, ICON_NONE);
-  uiItemR(col, &ptr, "mark_sharp", 0, NULL, ICON_NONE);
   uiItemR(col, &ptr, "harden_normals", 0, NULL, ICON_NONE);
 
+  col = uiLayoutColumnWithHeading(layout, true, "Mark");
+  uiItemR(col, &ptr, "mark_seam", 0, IFACE_("Seam"), ICON_NONE);
+  uiItemR(col, &ptr, "mark_sharp", 0, IFACE_("Sharp"), ICON_NONE);
+
   uiItemR(layout, &ptr, "profile", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
   uiItemR(layout, &ptr, "material", 0, NULL, ICON_NONE);
 
@@ -374,6 +370,7 @@ static void advanced_panel_draw(const bContext *C, Panel *panel)
 
   uiItemR(layout, &ptr, "face_strength_mode", 0, NULL, ICON_NONE);
   uiItemR(layout, &ptr, "vmesh_method", 0, NULL, ICON_NONE);
+  uiItemR(layout, &ptr, "loop_slide", 0, NULL, ICON_NONE);
 }
 
 static void custom_profile_panel_draw_header(const bContext *C, Panel *panel)