[Bf-blender-cvs] [172ac7896bc] modifier-panels-ui: Updates to Skin, Subsurf and Wireframe modifier layouts
William Reynish
noreply at git.blender.org
Sun Apr 5 22:59:55 CEST 2020
Commit: 172ac7896bcc56ebcea6cc4094b47a5cde0647c1
Author: William Reynish
Date: Sun Apr 5 22:59:08 2020 +0200
Branches: modifier-panels-ui
https://developer.blender.org/rB172ac7896bcc56ebcea6cc4094b47a5cde0647c1
Updates to Skin, Subsurf and Wireframe modifier layouts
===================================================================
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 470719f8737..ad7da4e65b7 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -1943,7 +1943,7 @@ static void requiredDataMask(Object *UNUSED(ob),
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *row, *col;
+ uiLayout *row, *split;
uiLayout *layout = panel->layout;
PointerRNA ptr;
@@ -1956,14 +1956,26 @@ static void panel_draw(const bContext *C, Panel *panel)
uiLayoutSetPropSep(layout, true);
uiItemR(layout, &ptr, "branch_smoothing", 0, NULL, ICON_NONE);
+
+ split = uiLayoutSplit(layout, 0.5f, false);
+ row = uiLayoutRow(split, false);
+ uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_RIGHT);
+ uiItemL(row, IFACE_("Symmetry"), ICON_NONE);
+ row = uiLayoutRow(split, true);
+ uiLayoutSetPropSep(row, false);
+ uiItemR(row, &ptr, "use_x_symmetry", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_y_symmetry", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_z_symmetry", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
+ uiItemL(row, "", ICON_BLANK1);
+
uiItemR(layout, &ptr, "use_smooth_shade", 0, NULL, ICON_NONE);
row = uiLayoutRow(layout, false);
uiItemO(row, IFACE_("Create Armature"), ICON_NONE, "OBJECT_OT_skin_armature_create");
uiItemO(row, NULL, ICON_NONE, "MESH_OT_customdata_skin_add");
- col = uiLayoutColumn(layout, true);
- uiItemFullO(col,
+ row = uiLayoutRow(layout, true);
+ uiItemFullO(row,
"OBJECT_OT_skin_loose_mark_clear",
IFACE_("Mark Loose"),
ICON_NONE,
@@ -1972,7 +1984,7 @@ static void panel_draw(const bContext *C, Panel *panel)
0,
&op_ptr);
RNA_enum_set(&op_ptr, "action", 0); /* SKIN_LOOSE_MARK */
- uiItemFullO(col,
+ uiItemFullO(row,
"OBJECT_OT_skin_loose_mark_clear",
IFACE_("Clear Loose"),
ICON_NONE,
@@ -1988,25 +2000,9 @@ static void panel_draw(const bContext *C, Panel *panel)
modifier_panel_end(layout, &ptr);
}
-static void symmetry_panel_draw(const bContext *C, Panel *panel)
-{
- uiLayout *layout = panel->layout;
-
- PointerRNA ptr;
- modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
-
- uiLayoutSetPropSep(layout, true);
-
- uiItemR(layout, &ptr, "use_x_symmetry", 0, NULL, ICON_NONE);
- uiItemR(layout, &ptr, "use_y_symmetry", 0, NULL, ICON_NONE);
- uiItemR(layout, &ptr, "use_z_symmetry", 0, NULL, ICON_NONE);
-}
-
static void panelRegister(ARegionType *region_type)
{
- PanelType *panel_type = modifier_panel_register(region_type, "Skin", panel_draw);
- modifier_subpanel_register(
- region_type, "skin_symmetry", "Symmetry", NULL, symmetry_panel_draw, panel_type);
+ modifier_panel_register(region_type, "Skin", panel_draw);
}
ModifierTypeInfo modifierType_Skin = {
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index ce04b791779..6e79013ff99 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -291,7 +291,7 @@ static void deformMatrices(ModifierData *md,
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *sub, *row, *col, *split;
+ uiLayout *sub, *col;
uiLayout *layout = panel->layout;
PointerRNA ptr;
@@ -318,42 +318,36 @@ static void panel_draw(const bContext *C, Panel *panel)
PointerRNA ob_cycles_ptr = RNA_pointer_get(&ob_ptr, "cycles");
bool ob_use_adaptive_subdivision = RNA_boolean_get(&ob_cycles_ptr, "use_adaptive_subdivision");
- row = uiLayoutRow(layout, false);
- uiItemR(row, &ptr, "subdivision_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+ uiLayoutSetPropSep(layout, true);
- split = uiLayoutSplit(layout, 0.25f, false);
- col = uiLayoutColumn(split, false);
+ uiItemR(layout, &ptr, "subdivision_type", 0, NULL, ICON_NONE);
+
+ col = uiLayoutColumn(layout, false);
if (show_adaptive_options) {
- uiItemL(col, "Render:", ICON_NONE);
- uiItemR(row, &ob_cycles_ptr, "use_adaptive_subdivision", 0, "Adaptive", ICON_NONE);
+ uiItemR(col, &ob_cycles_ptr, "use_adaptive_subdivision", 0, "Adaptive", ICON_NONE);
+ sub = uiLayoutColumn(col, true);
if (ob_use_adaptive_subdivision) {
- uiItemR(row, &ob_cycles_ptr, "dicing_rate", 0, NULL, ICON_NONE);
+ uiItemR(sub, &ob_cycles_ptr, "dicing_rate", 0, NULL, ICON_NONE);
}
else {
- uiItemR(row, &ptr, "render_levels", 0, "Levels", ICON_NONE);
+ uiItemR(sub, &ptr, "render_levels", 0, "Subdivisions Render", ICON_NONE);
}
- uiItemS(col);
-
- uiItemL(col, IFACE_("Viewport:"), ICON_NONE);
- uiItemR(row, &ptr, "levels", 0, "Levels", ICON_NONE);
+ uiItemR(sub, &ptr, "levels", 0, "Viewport", ICON_NONE);
}
else {
- uiItemL(col, IFACE_("Subdivisions:"), ICON_NONE);
sub = uiLayoutColumn(col, true);
- uiItemR(sub, &ptr, "render_levels", 0, IFACE_("Render"), ICON_NONE);
+ uiItemR(sub, &ptr, "render_levels", 0, IFACE_("Subdivisions Render"), ICON_NONE);
uiItemR(sub, &ptr, "levels", 0, IFACE_("Viewport"), ICON_NONE);
uiItemR(col, &ptr, "quality", 0, NULL, ICON_NONE);
}
- col = uiLayoutColumn(split, false);
- uiItemL(col, IFACE_("Options:"), ICON_NONE);
sub = uiLayoutColumn(col, true);
uiLayoutSetActive(sub, !(show_adaptive_options && ob_use_adaptive_subdivision));
- uiItemR(sub, &ptr, "uv_smooth", 0, "", ICON_NONE);
- uiItemR(sub, &ptr, "show_only_control_edges", 0, NULL, ICON_NONE);
+ uiItemR(sub, &ptr, "uv_smooth", 0, NULL, ICON_NONE);
uiItemR(sub, &ptr, "use_creases", 0, NULL, ICON_NONE);
+ uiItemR(sub, &ptr, "show_only_control_edges", 0, NULL, ICON_NONE);
if (show_adaptive_options && ob_use_adaptive_subdivision) {
col = uiLayoutColumn(layout, true);
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c
index 1efaebaf529..12a1ddb72ef 100644
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@ -127,6 +127,9 @@ static void panel_draw(const bContext *C, Panel *panel)
PointerRNA ptr;
PointerRNA ob_ptr;
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
+ modifier_panel_buttons(C, panel);
+
+ uiLayoutSetPropSep(layout, true);
uiItemR(layout, &ptr, "thickness", 0, IFACE_("Thickness"), ICON_NONE);
uiItemR(layout, &ptr, "offset", 0, NULL, ICON_NONE);
@@ -153,15 +156,16 @@ static void vertex_group_panel_draw(const bContext *C, Panel *panel)
PointerRNA ptr;
PointerRNA ob_ptr;
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
- modifier_panel_buttons(C, panel);
bool has_vertex_group = RNA_string_length(&ptr, "vertex_group") != 0;
+ uiLayoutSetPropSep(layout, true);
+
row = uiLayoutRow(layout, true);
- uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", "", ICON_NONE);
+ uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, ICON_NONE);
sub = uiLayoutRow(row, true);
uiLayoutSetActive(sub, has_vertex_group);
- uiLayoutSetPropSep(sub, false);
+ uiLayoutSetPropDecorate(sub, false);
uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
row = uiLayoutRow(layout, true);
@@ -186,6 +190,8 @@ static void crease_panel_draw(const bContext *C, Panel *panel)
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+ uiLayoutSetPropSep(layout, true);
+
uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "use_crease"));
uiItemR(layout, &ptr, "crease_weight", UI_ITEM_R_SLIDER, IFACE_("Crease Weight"), ICON_NONE);
}
More information about the Bf-blender-cvs
mailing list