[Bf-blender-cvs] [f50222ba2e3] master: UI: Bevel: Show Offset type before offset amount

[Aaron Carlisle]

Commit: f50222ba2e3e4aa461c23b4f0b3f3382a9e0632c
Author: Aaron Carlisle
Date:   Sun Jun 7 21:03:26 2020 -0400
Branches: master
https://developer.blender.org/rBf50222ba2e3e4aa461c23b4f0b3f3382a9e0632c

UI: Bevel: Show Offset type before offset amount

Because this controls how the amount is used in should be set first and 
is more important therefor place it at the top.

This is also consistent with other areas in Blender

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

M	source/blender/editors/mesh/editmesh_bevel.c
M	source/blender/modifiers/intern/MOD_bevel.c

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

diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index e94412233ff..8d644875d11 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -938,6 +938,9 @@ static void edbm_bevel_ui(bContext *C, wmOperator *op)
 
   RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
 
+  col = uiLayoutRow(layout, true);
+  uiItemR(col, &ptr, "offset_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+
   if (RNA_enum_get(&ptr, "offset_type") == BEVEL_AMT_PERCENT) {
     uiItemR(layout, &ptr, "offset_pct", 0, NULL, ICON_NONE);
   }
@@ -958,8 +961,6 @@ static void edbm_bevel_ui(bContext *C, wmOperator *op)
         C, op->ptr, prop, RNA_property_enum_get(op->ptr, prop), &offset_name);
     uiItemR(layout, &ptr, "offset", 0, offset_name, ICON_NONE);
   }
-  row = uiLayoutRow(layout, true);
-  uiItemR(row, &ptr, "offset_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 
   split = uiLayoutSplit(layout, 0.5f, true);
   col = uiLayoutColumn(split, true);
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 76b8985975e..aeec8710ed1 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -287,6 +287,8 @@ static void panel_draw(const bContext *C, Panel *panel)
   uiLayoutSetPropSep(layout, true);
 
   col = uiLayoutColumn(layout, false);
+  uiItemR(col, &ptr, "offset_type", 0, NULL, ICON_NONE);
+  
   const char *offset_name = "";
   if (RNA_enum_get(&ptr, "offset_type") == BEVEL_AMT_PERCENT) {
     uiItemR(col, &ptr, "width_pct", 0, NULL, ICON_NONE);
@@ -305,7 +307,6 @@ static void panel_draw(const bContext *C, Panel *panel)
     }
     uiItemR(col, &ptr, "width", 0, IFACE_(offset_name), ICON_NONE);
   }
-  uiItemR(col, &ptr, "offset_type", 0, NULL, ICON_NONE);
 
   uiItemR(layout, &ptr, "segments", 0, NULL, ICON_NONE);