diff options
| -rw-r--r-- | source/blender/editors/mesh/editmesh_bevel.c | 5 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 8d644875d11..e94412233ff 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -938,9 +938,6 @@ 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); } @@ -961,6 +958,8 @@ 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 aeec8710ed1..76b8985975e 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -287,8 +287,6 @@ 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); @@ -307,6 +305,7 @@ 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); |