diff options
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index 2d2f39f0189..efb8cf86fb5 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -222,44 +222,43 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *sub, *row, *col; uiLayout *layout = panel->layout; - PointerRNA ptr; PointerRNA ob_ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, &ob_ptr); - PointerRNA hook_object_ptr = RNA_pointer_get(&ptr, "object"); - bool has_vertex_group = RNA_string_length(&ptr, "vertex_group") != 0; + PointerRNA hook_object_ptr = RNA_pointer_get(ptr, "object"); + bool has_vertex_group = RNA_string_length(ptr, "vertex_group") != 0; uiLayoutSetPropSep(layout, true); col = uiLayoutColumn(layout, false); - uiItemR(col, &ptr, "object", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "object", 0, NULL, ICON_NONE); if (!RNA_pointer_is_null(&hook_object_ptr) && RNA_enum_get(&hook_object_ptr, "type") == OB_ARMATURE) { PointerRNA hook_object_data_ptr = RNA_pointer_get(&hook_object_ptr, "data"); uiItemPointerR( - col, &ptr, "subtarget", &hook_object_data_ptr, "bones", IFACE_("Bone"), ICON_NONE); + col, ptr, "subtarget", &hook_object_data_ptr, "bones", IFACE_("Bone"), ICON_NONE); } row = uiLayoutRow(layout, true); - uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, 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); - uiItemR(sub, &ptr, "invert_vertex", 0, "", ICON_ARROW_LEFTRIGHT); + uiItemR(sub, ptr, "invert_vertex", 0, "", ICON_ARROW_LEFTRIGHT); - uiItemR(layout, &ptr, "strength", UI_ITEM_R_SLIDER, NULL, ICON_NONE); + uiItemR(layout, ptr, "strength", UI_ITEM_R_SLIDER, NULL, ICON_NONE); - gpencil_modifier_panel_end(layout, &ptr); + gpencil_modifier_panel_end(layout, ptr); } -static void mask_panel_draw(const bContext *C, Panel *panel) +static void mask_panel_draw(const bContext *UNUSED(C), Panel *panel) { - gpencil_modifier_masking_panel_draw(C, panel, true, false); + gpencil_modifier_masking_panel_draw(panel, true, false); } static void panelRegister(ARegionType *region_type) |