archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert "UI: Bevel: Show Offset type before offset amount"

Browse Source 
This reverts commit f50222ba2e.
This commit is contained in:
Aaron Carlisle
2020-06-08 05:39:48 -04:00
parent 4d168e0b8c
commit 460c1d8e20
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/mesh/editmesh_bevel.c
View File

@@ -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);

3
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -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);