diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvgproximity.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 71c56255e3c..994f2c04921 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -643,63 +643,60 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * return mesh; } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col; 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); - uiItemPointerR(layout, &ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, ICON_NONE); + uiItemPointerR(layout, ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, ICON_NONE); - uiItemR(layout, &ptr, "target", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "target", 0, NULL, ICON_NONE); uiItemS(layout); - uiItemR(layout, &ptr, "proximity_mode", 0, NULL, ICON_NONE); - if (RNA_enum_get(&ptr, "proximity_mode") == MOD_WVG_PROXIMITY_GEOMETRY) { - uiItemR(layout, &ptr, "proximity_geometry", UI_ITEM_R_EXPAND, IFACE_("Geometry"), ICON_NONE); + uiItemR(layout, ptr, "proximity_mode", 0, NULL, ICON_NONE); + if (RNA_enum_get(ptr, "proximity_mode") == MOD_WVG_PROXIMITY_GEOMETRY) { + uiItemR(layout, ptr, "proximity_geometry", UI_ITEM_R_EXPAND, IFACE_("Geometry"), ICON_NONE); } col = uiLayoutColumn(layout, true); - uiItemR(col, &ptr, "min_dist", 0, NULL, ICON_NONE); - uiItemR(col, &ptr, "max_dist", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "min_dist", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "max_dist", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "normalize", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "normalize", 0, NULL, ICON_NONE); } -static void falloff_panel_draw(const bContext *C, Panel *panel) +static void falloff_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *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); row = uiLayoutRow(layout, true); - uiItemR(row, &ptr, "falloff_type", 0, IFACE_("Type"), ICON_NONE); + uiItemR(row, ptr, "falloff_type", 0, IFACE_("Type"), ICON_NONE); sub = uiLayoutRow(row, true); uiLayoutSetPropSep(sub, false); - uiItemR(row, &ptr, "invert_falloff", 0, "", ICON_ARROW_LEFTRIGHT); - modifier_panel_end(layout, &ptr); + uiItemR(row, ptr, "invert_falloff", 0, "", ICON_ARROW_LEFTRIGHT); + modifier_panel_end(layout, ptr); } static void influence_panel_draw(const bContext *C, Panel *panel) { 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); - weightvg_ui_common(C, &ob_ptr, &ptr, layout); + weightvg_ui_common(C, &ob_ptr, ptr, layout); } static void panelRegister(ARegionType *region_type) |