diff options
author | Hans Goudey <h.goudey@me.com> | 2020-09-02 22:13:26 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-09-02 22:13:26 +0300 |
commit | ba4a2a4c8b827201b18e97d9dd025ef93a4db754 (patch) | |
tree | a71d6b72aaf0616ebda671bf4b011880b49bb280 /source/blender/modifiers/intern/MOD_wireframe.c | |
parent | ff7d74235023d0c927c0ad3f4d72d1c5dd41b240 (diff) |
UI: Use instanced panel custom data instead of list index
For modifier shortcuts we added a "custom_data" field to panels.
This commit uses the same system for accessing the list data that
corresponds to each panel. This way the context is only used once
and the modifier for each panel can be accessed more easily later.
This ends up being mostly a cleanup commit with a few small changes
in interface_panel.c. The large changes in the UI functions are due
to the fact that the panel custom data is now passed around as a
single pointer instead of being created again for every panel.
The list_index variable in Panel.runtime is removed as it's now
unnecessary.
Differential Revision: https://developer.blender.org/D8559
Diffstat (limited to 'source/blender/modifiers/intern/MOD_wireframe.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_wireframe.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index ef3d16c1b32..602e0bf3eda 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -117,57 +117,55 @@ static Mesh *modifyMesh(ModifierData *md, const struct ModifierEvalContext *ctx, return WireframeModifier_do((WireframeModifierData *)md, ctx->object, mesh); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col, *row, *sub; uiLayout *layout = panel->layout; - PointerRNA ptr; PointerRNA ob_ptr; - modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); + PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "thickness", 0, IFACE_("Thickness"), ICON_NONE); - uiItemR(layout, &ptr, "offset", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "thickness", 0, IFACE_("Thickness"), ICON_NONE); + uiItemR(layout, ptr, "offset", 0, NULL, ICON_NONE); col = uiLayoutColumn(layout, true); - uiItemR(col, &ptr, "use_boundary", 0, IFACE_("Boundary"), ICON_NONE); - uiItemR(col, &ptr, "use_replace", 0, IFACE_("Replace Original"), ICON_NONE); + uiItemR(col, ptr, "use_boundary", 0, IFACE_("Boundary"), ICON_NONE); + uiItemR(col, ptr, "use_replace", 0, IFACE_("Replace Original"), ICON_NONE); col = uiLayoutColumnWithHeading(layout, true, IFACE_("Thickness")); - uiItemR(col, &ptr, "use_even_offset", 0, IFACE_("Even"), ICON_NONE); - uiItemR(col, &ptr, "use_relative_offset", 0, IFACE_("Relative"), ICON_NONE); + uiItemR(col, ptr, "use_even_offset", 0, IFACE_("Even"), ICON_NONE); + uiItemR(col, ptr, "use_relative_offset", 0, IFACE_("Relative"), ICON_NONE); row = uiLayoutRowWithHeading(layout, true, IFACE_("Crease Edges")); - uiItemR(row, &ptr, "use_crease", 0, "", ICON_NONE); + uiItemR(row, ptr, "use_crease", 0, "", ICON_NONE); sub = uiLayoutRow(row, true); - uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_crease")); - uiItemR(sub, &ptr, "crease_weight", UI_ITEM_R_SLIDER, "", ICON_NONE); + uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_crease")); + uiItemR(sub, ptr, "crease_weight", UI_ITEM_R_SLIDER, "", ICON_NONE); - uiItemR(layout, &ptr, "material_offset", 0, IFACE_("Material Offset"), ICON_NONE); + uiItemR(layout, ptr, "material_offset", 0, IFACE_("Material Offset"), ICON_NONE); - modifier_panel_end(layout, &ptr); + modifier_panel_end(layout, ptr); } -static void vertex_group_panel_draw(const bContext *C, Panel *panel) +static void vertex_group_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *row; uiLayout *layout = panel->layout; - PointerRNA ptr; PointerRNA ob_ptr; - modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); + PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr); - bool has_vertex_group = RNA_string_length(&ptr, "vertex_group") != 0; + bool has_vertex_group = RNA_string_length(ptr, "vertex_group") != 0; uiLayoutSetPropSep(layout, true); - modifier_vgroup_ui(layout, &ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL); + modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL); row = uiLayoutRow(layout, true); uiLayoutSetActive(row, has_vertex_group); - uiItemR(row, &ptr, "thickness_vertex_group", 0, IFACE_("Factor"), ICON_NONE); + uiItemR(row, ptr, "thickness_vertex_group", 0, IFACE_("Factor"), ICON_NONE); } static void panelRegister(ARegionType *region_type) |