diff options
Diffstat (limited to 'source/blender/gpencil_modifiers')
20 files changed, 317 insertions, 368 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c index a9afbc4b6ae..be71f4882f6 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c @@ -68,9 +68,9 @@ static bool gpencil_modifier_ui_poll(const bContext *C, PanelType *UNUSED(pt)) */ static void gpencil_modifier_reorder(bContext *C, Panel *panel, int new_index) { - Object *ob = ED_object_active_context(C); + PointerRNA *md_ptr = UI_panel_custom_data_get(panel); + GpencilModifierData *md = (GpencilModifierData *)md_ptr->data; - GpencilModifierData *md = BLI_findlink(&ob->greasepencil_modifiers, panel->runtime.list_index); PointerRNA props_ptr; wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_gpencil_modifier_move_to_index", false); WM_operator_properties_create_ptr(&props_ptr, ot); @@ -80,18 +80,19 @@ static void gpencil_modifier_reorder(bContext *C, Panel *panel, int new_index) WM_operator_properties_free(&props_ptr); } -static short get_gpencil_modifier_expand_flag(const bContext *C, Panel *panel) +static short get_gpencil_modifier_expand_flag(const bContext *UNUSED(C), Panel *panel) { - Object *ob = ED_object_active_context(C); - GpencilModifierData *md = BLI_findlink(&ob->greasepencil_modifiers, panel->runtime.list_index); + PointerRNA *md_ptr = UI_panel_custom_data_get(panel); + GpencilModifierData *md = (GpencilModifierData *)md_ptr->data; return md->ui_expand_flag; - return 0; } -static void set_gpencil_modifier_expand_flag(const bContext *C, Panel *panel, short expand_flag) +static void set_gpencil_modifier_expand_flag(const bContext *UNUSED(C), + Panel *panel, + short expand_flag) { - Object *ob = ED_object_active_context(C); - GpencilModifierData *md = BLI_findlink(&ob->greasepencil_modifiers, panel->runtime.list_index); + PointerRNA *md_ptr = UI_panel_custom_data_get(panel); + GpencilModifierData *md = (GpencilModifierData *)md_ptr->data; md->ui_expand_flag = expand_flag; } @@ -101,40 +102,36 @@ static void set_gpencil_modifier_expand_flag(const bContext *C, Panel *panel, sh /** \name Modifier Panel Layouts * \{ */ -void gpencil_modifier_masking_panel_draw(const bContext *C, - Panel *panel, - bool use_material, - bool use_vertex) +void gpencil_modifier_masking_panel_draw(Panel *panel, bool use_material, bool use_vertex) { uiLayout *row, *col, *sub; 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 obj_data_ptr = RNA_pointer_get(&ob_ptr, "data"); - bool has_layer = RNA_string_length(&ptr, "layer") != 0; + bool has_layer = RNA_string_length(ptr, "layer") != 0; uiLayoutSetPropSep(layout, true); col = uiLayoutColumn(layout, true); row = uiLayoutRow(col, true); - uiItemPointerR(row, &ptr, "layer", &obj_data_ptr, "layers", NULL, ICON_GREASEPENCIL); + uiItemPointerR(row, ptr, "layer", &obj_data_ptr, "layers", NULL, ICON_GREASEPENCIL); sub = uiLayoutRow(row, true); uiLayoutSetActive(sub, has_layer); uiLayoutSetPropDecorate(sub, false); - uiItemR(sub, &ptr, "invert_layers", 0, "", ICON_ARROW_LEFTRIGHT); + uiItemR(sub, ptr, "invert_layers", 0, "", ICON_ARROW_LEFTRIGHT); row = uiLayoutRow(col, true); - uiItemR(row, &ptr, "layer_pass", 0, NULL, ICON_NONE); + uiItemR(row, ptr, "layer_pass", 0, NULL, ICON_NONE); sub = uiLayoutRow(row, true); - uiLayoutSetActive(sub, RNA_int_get(&ptr, "layer_pass") != 0); + uiLayoutSetActive(sub, RNA_int_get(ptr, "layer_pass") != 0); uiLayoutSetPropDecorate(sub, false); - uiItemR(sub, &ptr, "invert_layer_pass", 0, "", ICON_ARROW_LEFTRIGHT); + uiItemR(sub, ptr, "invert_layer_pass", 0, "", ICON_ARROW_LEFTRIGHT); if (use_material) { - PointerRNA material_ptr = RNA_pointer_get(&ptr, "material"); + PointerRNA material_ptr = RNA_pointer_get(ptr, "material"); bool has_material = !RNA_pointer_is_null(&material_ptr); /* Because the Gpencil modifier material property used to be a string in an earlier version of @@ -161,7 +158,7 @@ void gpencil_modifier_masking_panel_draw(const bContext *C, row = uiLayoutRow(col, true); uiLayoutSetRedAlert(row, !valid); uiItemPointerR(row, - &ptr, + ptr, "material", &obj_data_ptr, "materials", @@ -170,46 +167,44 @@ void gpencil_modifier_masking_panel_draw(const bContext *C, sub = uiLayoutRow(row, true); uiLayoutSetActive(sub, has_material); uiLayoutSetPropDecorate(sub, false); - uiItemR(sub, &ptr, "invert_materials", 0, "", ICON_ARROW_LEFTRIGHT); + uiItemR(sub, ptr, "invert_materials", 0, "", ICON_ARROW_LEFTRIGHT); row = uiLayoutRow(col, true); - uiItemR(row, &ptr, "pass_index", 0, NULL, ICON_NONE); + uiItemR(row, ptr, "pass_index", 0, NULL, ICON_NONE); sub = uiLayoutRow(row, true); - uiLayoutSetActive(sub, RNA_int_get(&ptr, "pass_index") != 0); + uiLayoutSetActive(sub, RNA_int_get(ptr, "pass_index") != 0); uiLayoutSetPropDecorate(sub, false); - uiItemR(sub, &ptr, "invert_material_pass", 0, "", ICON_ARROW_LEFTRIGHT); + uiItemR(sub, ptr, "invert_material_pass", 0, "", ICON_ARROW_LEFTRIGHT); } if (use_vertex) { - bool has_vertex_group = RNA_string_length(&ptr, "vertex_group") != 0; + bool has_vertex_group = RNA_string_length(ptr, "vertex_group") != 0; 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); uiLayoutSetPropDecorate(sub, false); - uiItemR(sub, &ptr, "invert_vertex", 0, "", ICON_ARROW_LEFTRIGHT); + uiItemR(sub, ptr, "invert_vertex", 0, "", ICON_ARROW_LEFTRIGHT); } } -void gpencil_modifier_curve_header_draw(const bContext *C, Panel *panel) +void gpencil_modifier_curve_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiItemR(layout, &ptr, "use_custom_curve", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "use_custom_curve", 0, NULL, ICON_NONE); } -void gpencil_modifier_curve_panel_draw(const bContext *C, Panel *panel) +void gpencil_modifier_curve_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiTemplateCurveMapping(layout, &ptr, "curve", 0, false, false, false, false); + uiTemplateCurveMapping(layout, ptr, "curve", 0, false, false, false, false); } /** @@ -228,25 +223,22 @@ void gpencil_modifier_panel_end(uiLayout *layout, PointerRNA *ptr) * Gets RNA pointers for the active object and the panel's modifier data. */ #define ERROR_LIBDATA_MESSAGE TIP_("External library data") -void gpencil_modifier_panel_get_property_pointers(const bContext *C, - Panel *panel, - PointerRNA *r_ob_ptr, - PointerRNA *r_md_ptr) +PointerRNA *gpencil_modifier_panel_get_property_pointers(Panel *panel, PointerRNA *r_ob_ptr) { - Object *ob = ED_object_active_context(C); - GpencilModifierData *md = BLI_findlink(&ob->greasepencil_modifiers, panel->runtime.list_index); - - RNA_pointer_create(&ob->id, &RNA_GpencilModifier, md, r_md_ptr); + PointerRNA *ptr = UI_panel_custom_data_get(panel); + BLI_assert(RNA_struct_is_a(ptr->type, &RNA_GpencilModifier)); if (r_ob_ptr != NULL) { - RNA_pointer_create(&ob->id, &RNA_Object, ob, r_ob_ptr); + RNA_pointer_create(ptr->owner_id, &RNA_Object, ptr->owner_id, r_ob_ptr); } uiBlock *block = uiLayoutGetBlock(panel->layout); UI_block_lock_clear(block); - UI_block_lock_set(block, ob && ID_IS_LINKED(ob), ERROR_LIBDATA_MESSAGE); + UI_block_lock_set(block, ID_IS_LINKED((Object *)ptr->owner_id), ERROR_LIBDATA_MESSAGE); + + uiLayoutSetContextPointer(panel->layout, "modifier", ptr); - uiLayoutSetContextPointer(panel->layout, "modifier", r_md_ptr); + return ptr; } static void gpencil_modifier_ops_extra_draw(bContext *C, uiLayout *layout, void *md_v) @@ -311,16 +303,15 @@ static void gpencil_modifier_ops_extra_draw(bContext *C, uiLayout *layout, void } } -static void gpencil_modifier_panel_header(const bContext *C, Panel *panel) +static void gpencil_modifier_panel_header(const bContext *UNUSED(C), Panel *panel) { uiLayout *row, *sub; uiLayout *layout = panel->layout; - Object *ob = ED_object_active_context(C); - GpencilModifierData *md = BLI_findlink(&ob->greasepencil_modifiers, panel->runtime.list_index); - PointerRNA ptr; - RNA_pointer_create(&ob->id, &RNA_GpencilModifier, md, &ptr); - uiLayoutSetContextPointer(panel->layout, "modifier", &ptr); + PointerRNA *ptr = UI_panel_custom_data_get(panel); + GpencilModifierData *md = (GpencilModifierData *)ptr->data; + + uiLayoutSetContextPointer(panel->layout, "modifier", ptr); const GpencilModifierTypeInfo *mti = BKE_gpencil_modifier_get_info(md->type); bool narrow_panel = (panel->sizex < UI_UNIT_X * 9 && panel->sizex != 0); @@ -330,12 +321,12 @@ static void gpencil_modifier_panel_header(const bContext *C, Panel *panel) if (mti->isDisabled && mti->isDisabled(md, 0)) { uiLayoutSetRedAlert(row, true); } - uiItemL(row, "", RNA_struct_ui_icon(ptr.type)); + uiItemL(row, "", RNA_struct_ui_icon(ptr->type)); /* Modifier name. */ row = uiLayoutRow(layout, true); if (!narrow_panel) { - uiItemR(row, &ptr, "name", 0, "", ICON_NONE); + uiItemR(row, ptr, "name", 0, "", ICON_NONE); } else { uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_RIGHT); @@ -344,10 +335,10 @@ static void gpencil_modifier_panel_header(const bContext *C, Panel *panel) /* Display mode buttons. */ if (mti->flags & eGpencilModifierTypeFlag_SupportsEditmode) { sub = uiLayoutRow(row, true); - uiItemR(sub, &ptr, "show_in_editmode", 0, "", ICON_NONE); + uiItemR(sub, ptr, "show_in_editmode", 0, "", ICON_NONE); } - uiItemR(row, &ptr, "show_viewport", 0, "", ICON_NONE); - uiItemR(row, &ptr, "show_render", 0, "", ICON_NONE); + uiItemR(row, ptr, "show_viewport", 0, "", ICON_NONE); + uiItemR(row, ptr, "show_render", 0, "", ICON_NONE); /* Extra operators. */ // row = uiLayoutRow(layout, true); diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h index c85e939b13f..6590c04f03e 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h @@ -32,20 +32,15 @@ struct PanelType; struct uiLayout; typedef void (*PanelDrawFn)(const bContext *, Panel *); -void gpencil_modifier_masking_panel_draw(const bContext *C, - Panel *panel, - bool use_material, - bool use_vertex); +void gpencil_modifier_masking_panel_draw(Panel *panel, bool use_material, bool use_vertex); -void gpencil_modifier_curve_header_draw(const bContext *C, Panel *panel); -void gpencil_modifier_curve_panel_draw(const bContext *C, Panel *panel); +void gpencil_modifier_curve_header_draw(const bContext *UNUSED(C), Panel *panel); +void gpencil_modifier_curve_panel_draw(const bContext *UNUSED(C), Panel *panel); void gpencil_modifier_panel_end(struct uiLayout *layout, PointerRNA *ptr); -void gpencil_modifier_panel_get_property_pointers(const bContext *C, - struct Panel *panel, - struct PointerRNA *r_ob_ptr, - struct PointerRNA *r_ptr); +struct PointerRNA *gpencil_modifier_panel_get_property_pointers(struct Panel *panel, + struct PointerRNA *r_ob_ptr); PanelType *gpencil_modifier_panel_register(struct ARegionType *region_type, GpencilModifierType type, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c index 41365da1153..6b6fdaa5d17 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c @@ -195,32 +195,31 @@ static void foreachObjectLink(GpencilModifierData *md, walk(userData, ob, &mmd->object, IDWALK_CB_NOP); } -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); - 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); - uiItemR(layout, &ptr, "object", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "object", 0, NULL, 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); uiLayoutSetPropDecorate(sub, false); - uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT); + uiItemR(sub, ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT); col = uiLayoutColumnWithHeading(layout, true, IFACE_("Bind to")); - uiItemR(col, &ptr, "use_vertex_groups", 0, IFACE_("Vertex Groups"), ICON_NONE); - uiItemR(col, &ptr, "use_bone_envelopes", 0, IFACE_("Bone Envelopes"), ICON_NONE); + uiItemR(col, ptr, "use_vertex_groups", 0, IFACE_("Vertex Groups"), ICON_NONE); + uiItemR(col, ptr, "use_bone_envelopes", 0, IFACE_("Bone Envelopes"), ICON_NONE); - gpencil_modifier_panel_end(layout, &ptr); + gpencil_modifier_panel_end(layout, ptr); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c index d645064475b..f1651624d90 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c @@ -344,117 +344,109 @@ 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 *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "count", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "replace_material", 0, IFACE_("Material Override"), ICON_NONE); + uiItemR(layout, ptr, "count", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "replace_material", 0, IFACE_("Material Override"), ICON_NONE); - gpencil_modifier_panel_end(layout, &ptr); + gpencil_modifier_panel_end(layout, ptr); } -static void relative_offset_header_draw(const bContext *C, Panel *panel) +static void relative_offset_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiItemR(layout, &ptr, "use_relative_offset", 0, IFACE_("Relative Offset"), ICON_NONE); + uiItemR(layout, ptr, "use_relative_offset", 0, IFACE_("Relative Offset"), ICON_NONE); } -static void relative_offset_draw(const bContext *C, Panel *panel) +static void relative_offset_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); uiLayout *col = uiLayoutColumn(layout, false); - uiLayoutSetActive(col, RNA_boolean_get(&ptr, "use_relative_offset")); - uiItemR(col, &ptr, "relative_offset", 0, IFACE_("Factor"), ICON_NONE); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_relative_offset")); + uiItemR(col, ptr, "relative_offset", 0, IFACE_("Factor"), ICON_NONE); } -static void constant_offset_header_draw(const bContext *C, Panel *panel) +static void constant_offset_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiItemR(layout, &ptr, "use_constant_offset", 0, IFACE_("Constant Offset"), ICON_NONE); + uiItemR(layout, ptr, "use_constant_offset", 0, IFACE_("Constant Offset"), ICON_NONE); } -static void constant_offset_draw(const bContext *C, Panel *panel) +static void constant_offset_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); uiLayout *col = uiLayoutColumn(layout, false); - uiLayoutSetActive(col, RNA_boolean_get(&ptr, "use_constant_offset")); - uiItemR(col, &ptr, "constant_offset", 0, IFACE_("Distance"), ICON_NONE); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_constant_offset")); + uiItemR(col, ptr, "constant_offset", 0, IFACE_("Distance"), ICON_NONE); } /** * Object offset in a subpanel for consistency with the other offset types. */ -static void object_offset_header_draw(const bContext *C, Panel *panel) +static void object_offset_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiItemR(layout, &ptr, "use_object_offset", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "use_object_offset", 0, NULL, ICON_NONE); } -static void object_offset_draw(const bContext *C, Panel *panel) +static void object_offset_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); uiLayout *col = uiLayoutColumn(layout, false); - uiLayoutSetActive(col, RNA_boolean_get(&ptr, "use_object_offset")); - uiItemR(col, &ptr, "offset_object", 0, NULL, ICON_NONE); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_object_offset")); + uiItemR(col, ptr, "offset_object", 0, NULL, ICON_NONE); } -static void random_panel_draw(const bContext *C, Panel *panel) +static void random_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "random_offset", 0, IFACE_("Offset"), ICON_NONE); - uiItemR(layout, &ptr, "random_rotation", 0, IFACE_("Rotation"), ICON_NONE); - uiItemR(layout, &ptr, "random_scale", 0, IFACE_("Scale"), ICON_NONE); - uiItemR(layout, &ptr, "seed", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "random_offset", 0, IFACE_("Offset"), ICON_NONE); + uiItemR(layout, ptr, "random_rotation", 0, IFACE_("Rotation"), ICON_NONE); + uiItemR(layout, ptr, "random_scale", 0, IFACE_("Scale"), ICON_NONE); + uiItemR(layout, ptr, "seed", 0, NULL, ICON_NONE); } -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) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c index bf6c47b2df5..2f10361989f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c @@ -539,76 +539,73 @@ static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Objec } } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *row, *sub; 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); - int mode = RNA_enum_get(&ptr, "mode"); + int mode = RNA_enum_get(ptr, "mode"); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "mode", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE); if (mode == GP_BUILD_MODE_CONCURRENT) { - uiItemR(layout, &ptr, "concurrent_time_alignment", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "concurrent_time_alignment", 0, NULL, ICON_NONE); } uiItemS(layout); - uiItemR(layout, &ptr, "transition", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "start_delay", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "length", 0, IFACE_("Frames"), ICON_NONE); + uiItemR(layout, ptr, "transition", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "start_delay", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "length", 0, IFACE_("Frames"), ICON_NONE); uiItemS(layout); row = uiLayoutRowWithHeading(layout, true, IFACE_("Use Factor")); - uiItemR(row, &ptr, "use_percentage", 0, "", ICON_NONE); + uiItemR(row, ptr, "use_percentage", 0, "", ICON_NONE); sub = uiLayoutRow(row, true); - uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_percentage")); - uiItemR(sub, &ptr, "percentage_factor", 0, "", ICON_NONE); + uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_percentage")); + uiItemR(sub, ptr, "percentage_factor", 0, "", ICON_NONE); /* Check for incompatible time modifier. */ Object *ob = ob_ptr.data; - GpencilModifierData *md = ptr.data; + GpencilModifierData *md = ptr->data; if (BKE_gpencil_modifiers_findby_type(ob, eGpencilModifierType_Time) != NULL) { BKE_gpencil_modifier_set_error(md, "Build and Time Offset modifiers are incompatible"); } - gpencil_modifier_panel_end(layout, &ptr); + gpencil_modifier_panel_end(layout, ptr); } -static void frame_range_header_draw(const bContext *C, Panel *panel) +static void frame_range_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiItemR(layout, &ptr, "use_restrict_frame_range", 0, IFACE_("Custom Range"), ICON_NONE); + uiItemR(layout, ptr, "use_restrict_frame_range", 0, IFACE_("Custom Range"), ICON_NONE); } -static void frame_range_panel_draw(const bContext *C, Panel *panel) +static void frame_range_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col; uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); col = uiLayoutColumn(layout, false); - uiItemR(col, &ptr, "frame_start", 0, IFACE_("Start"), ICON_NONE); - uiItemR(col, &ptr, "frame_end", 0, IFACE_("End"), ICON_NONE); + uiItemR(col, ptr, "frame_start", 0, IFACE_("Start"), ICON_NONE); + uiItemR(col, ptr, "frame_end", 0, IFACE_("End"), ICON_NONE); } -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, false, false); + gpencil_modifier_masking_panel_draw(panel, false, false); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 21a8962b131..3bc60a1bcf2 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -197,26 +197,25 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "modify_color", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "hue", UI_ITEM_R_SLIDER, NULL, ICON_NONE); - uiItemR(layout, &ptr, "saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE); - uiItemR(layout, &ptr, "value", UI_ITEM_R_SLIDER, NULL, ICON_NONE); + uiItemR(layout, ptr, "modify_color", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "hue", UI_ITEM_R_SLIDER, NULL, ICON_NONE); + uiItemR(layout, ptr, "saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE); + uiItemR(layout, ptr, "value", 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) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index 1608d7a2d4c..83c65e2d3a2 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -359,69 +359,67 @@ 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 falloff_panel_draw(const bContext *C, Panel *panel) +static void falloff_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *row; uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - bool use_falloff = RNA_enum_get(&ptr, "falloff_type") != eWarp_Falloff_None; + bool use_falloff = RNA_enum_get(ptr, "falloff_type") != eWarp_Falloff_None; uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "falloff_type", 0, IFACE_("Type"), ICON_NONE); + uiItemR(layout, ptr, "falloff_type", 0, IFACE_("Type"), ICON_NONE); row = uiLayoutRow(layout, false); uiLayoutSetActive(row, use_falloff); - uiItemR(row, &ptr, "falloff_radius", 0, NULL, ICON_NONE); + uiItemR(row, ptr, "falloff_radius", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "use_falloff_uniform", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "use_falloff_uniform", 0, NULL, ICON_NONE); - if (RNA_enum_get(&ptr, "falloff_type") == eWarp_Falloff_Curve) { - uiTemplateCurveMapping(layout, &ptr, "falloff_curve", 0, false, false, false, false); + if (RNA_enum_get(ptr, "falloff_type") == eWarp_Falloff_Curve) { + uiTemplateCurveMapping(layout, ptr, "falloff_curve", 0, false, false, false, false); } } -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) 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) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index 3554cf2e4eb..0a8d856863b 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -235,30 +235,29 @@ 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 *row; uiLayout *layout = panel->layout; int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis")); - uiItemR(row, &ptr, "x_axis", toggles_flag, NULL, ICON_NONE); - uiItemR(row, &ptr, "y_axis", toggles_flag, NULL, ICON_NONE); - uiItemR(row, &ptr, "z_axis", toggles_flag, NULL, ICON_NONE); + uiItemR(row, ptr, "x_axis", toggles_flag, NULL, ICON_NONE); + uiItemR(row, ptr, "y_axis", toggles_flag, NULL, ICON_NONE); + uiItemR(row, ptr, "z_axis", toggles_flag, NULL, ICON_NONE); - uiItemR(layout, &ptr, "object", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "object", 0, 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) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c index 0f6daea50ef..77e1f9c9b7f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c @@ -315,57 +315,54 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -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; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "duplicates", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "duplicates", 0, NULL, ICON_NONE); col = uiLayoutColumn(layout, false); - uiLayoutSetActive(layout, RNA_int_get(&ptr, "duplicates") > 0); - uiItemR(col, &ptr, "distance", 0, NULL, ICON_NONE); - uiItemR(col, &ptr, "offset", UI_ITEM_R_SLIDER, NULL, ICON_NONE); + uiLayoutSetActive(layout, RNA_int_get(ptr, "duplicates") > 0); + uiItemR(col, ptr, "distance", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "offset", UI_ITEM_R_SLIDER, NULL, ICON_NONE); - gpencil_modifier_panel_end(layout, &ptr); + gpencil_modifier_panel_end(layout, ptr); } -static void fade_header_draw(const bContext *C, Panel *panel) +static void fade_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiItemR(layout, &ptr, "use_fade", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "use_fade", 0, NULL, ICON_NONE); } -static void fade_panel_draw(const bContext *C, Panel *panel) +static void fade_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col; uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "use_fade")); + uiLayoutSetActive(layout, RNA_boolean_get(ptr, "use_fade")); col = uiLayoutColumn(layout, false); - uiItemR(col, &ptr, "fading_center", 0, NULL, ICON_NONE); - uiItemR(col, &ptr, "fading_thickness", UI_ITEM_R_SLIDER, NULL, ICON_NONE); - uiItemR(col, &ptr, "fading_opacity", UI_ITEM_R_SLIDER, NULL, ICON_NONE); + uiItemR(col, ptr, "fading_center", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "fading_thickness", UI_ITEM_R_SLIDER, NULL, ICON_NONE); + uiItemR(col, ptr, "fading_opacity", UI_ITEM_R_SLIDER, NULL, ICON_NONE); } -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) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index 67c26bf2584..57823e25387 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -280,54 +280,51 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -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; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); col = uiLayoutColumn(layout, false); - uiItemR(col, &ptr, "factor", 0, IFACE_("Position"), ICON_NONE); - uiItemR(col, &ptr, "factor_strength", 0, IFACE_("Strength"), ICON_NONE); - uiItemR(col, &ptr, "factor_thickness", 0, IFACE_("Thickness"), ICON_NONE); - uiItemR(col, &ptr, "factor_uvs", 0, IFACE_("UV"), ICON_NONE); - uiItemR(col, &ptr, "noise_scale", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "factor", 0, IFACE_("Position"), ICON_NONE); + uiItemR(col, ptr, "factor_strength", 0, IFACE_("Strength"), ICON_NONE); + uiItemR(col, ptr, "factor_thickness", 0, IFACE_("Thickness"), ICON_NONE); + uiItemR(col, ptr, "factor_uvs", 0, IFACE_("UV"), ICON_NONE); + uiItemR(col, ptr, "noise_scale", 0, NULL, ICON_NONE); - gpencil_modifier_panel_end(layout, &ptr); + gpencil_modifier_panel_end(layout, ptr); } -static void random_header_draw(const bContext *C, Panel *panel) +static void random_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - uiItemR(layout, &ptr, "random", 0, IFACE_("Randomize"), ICON_NONE); + uiItemR(layout, ptr, "random", 0, IFACE_("Randomize"), ICON_NONE); } -static void random_panel_draw(const bContext *C, Panel *panel) +static void random_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "random")); + uiLayoutSetActive(layout, RNA_boolean_get(ptr, "random")); - uiItemR(layout, &ptr, "step", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "seed", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "step", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "seed", 0, NULL, ICON_NONE); } -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, true); + gpencil_modifier_masking_panel_draw(panel, true, true); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index 75f929e979e..4e2c5a3ea94 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -151,25 +151,24 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "location", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "rotation", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "scale", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "location", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "rotation", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "scale", 0, 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, true); + gpencil_modifier_masking_panel_draw(panel, true, true); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index efa58cc4ae0..02a5bf6e4b1 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -208,51 +208,48 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - int modify_color = RNA_enum_get(&ptr, "modify_color"); + int modify_color = RNA_enum_get(ptr, "modify_color"); - uiItemR(layout, &ptr, "modify_color", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "modify_color", 0, NULL, ICON_NONE); if (modify_color == GP_MODIFY_COLOR_HARDNESS) { - uiItemR(layout, &ptr, "hardness", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "hardness", 0, NULL, ICON_NONE); } else { - uiItemR(layout, &ptr, "normalize_opacity", 0, NULL, ICON_NONE); - const char *text = (RNA_boolean_get(&ptr, "normalize_opacity")) ? IFACE_("Strength") : - IFACE_("Opacity Factor"); - uiItemR(layout, &ptr, "hardness", 0, text, ICON_NONE); + uiItemR(layout, ptr, "normalize_opacity", 0, NULL, ICON_NONE); + const char *text = (RNA_boolean_get(ptr, "normalize_opacity")) ? IFACE_("Strength") : + IFACE_("Opacity Factor"); + uiItemR(layout, ptr, "hardness", 0, text, 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) { - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int modify_color = RNA_enum_get(&ptr, "modify_color"); + int modify_color = RNA_enum_get(ptr, "modify_color"); bool show_vertex = (modify_color != GP_MODIFY_COLOR_HARDNESS); - gpencil_modifier_masking_panel_draw(C, panel, true, show_vertex); + gpencil_modifier_masking_panel_draw(panel, true, show_vertex); } static void curve_header_draw(const bContext *C, Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int modify_color = RNA_enum_get(&ptr, "modify_color"); + int modify_color = RNA_enum_get(ptr, "modify_color"); uiLayoutSetActive(layout, modify_color != GP_MODIFY_COLOR_HARDNESS); gpencil_modifier_curve_header_draw(C, panel); @@ -262,10 +259,9 @@ static void curve_panel_draw(const bContext *C, Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int modify_color = RNA_enum_get(&ptr, "modify_color"); + int modify_color = RNA_enum_get(ptr, "modify_color"); uiLayoutSetActive(layout, modify_color != GP_MODIFY_COLOR_HARDNESS); gpencil_modifier_curve_panel_draw(C, panel); diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c index 1e75c5926cd..ace9f4f91d6 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c @@ -142,38 +142,37 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int mode = RNA_enum_get(&ptr, "mode"); + int mode = RNA_enum_get(ptr, "mode"); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "mode", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE); if (mode == GP_SIMPLIFY_FIXED) { - uiItemR(layout, &ptr, "step", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "step", 0, NULL, ICON_NONE); } else if (mode == GP_SIMPLIFY_ADAPTIVE) { - uiItemR(layout, &ptr, "factor", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "factor", 0, NULL, ICON_NONE); } else if (mode == GP_SIMPLIFY_SAMPLE) { - uiItemR(layout, &ptr, "length", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "length", 0, NULL, ICON_NONE); } else if (mode == GP_SIMPLIFY_MERGE) { - uiItemR(layout, &ptr, "distance", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "distance", 0, 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) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c index e3511d9645e..abdd07e2649 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c @@ -185,31 +185,30 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *row; uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); row = uiLayoutRow(layout, true); - uiItemR(row, &ptr, "use_edit_position", UI_ITEM_R_TOGGLE, IFACE_("Position"), ICON_NONE); - uiItemR(row, &ptr, "use_edit_strength", UI_ITEM_R_TOGGLE, IFACE_("Strength"), ICON_NONE); - uiItemR(row, &ptr, "use_edit_thickness", UI_ITEM_R_TOGGLE, IFACE_("Thickness"), ICON_NONE); - uiItemR(row, &ptr, "use_edit_uv", UI_ITEM_R_TOGGLE, IFACE_("UV"), ICON_NONE); + uiItemR(row, ptr, "use_edit_position", UI_ITEM_R_TOGGLE, IFACE_("Position"), ICON_NONE); + uiItemR(row, ptr, "use_edit_strength", UI_ITEM_R_TOGGLE, IFACE_("Strength"), ICON_NONE); + uiItemR(row, ptr, "use_edit_thickness", UI_ITEM_R_TOGGLE, IFACE_("Thickness"), ICON_NONE); + uiItemR(row, ptr, "use_edit_uv", UI_ITEM_R_TOGGLE, IFACE_("UV"), ICON_NONE); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "factor", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "step", 0, IFACE_("Repeat"), ICON_NONE); + uiItemR(layout, ptr, "factor", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "step", 0, IFACE_("Repeat"), 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, true); + gpencil_modifier_masking_panel_draw(panel, true, true); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c index 2797235c002..29ddd21ec2a 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c @@ -123,24 +123,23 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "subdivision_type", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "level", 0, IFACE_("Subdivisions"), ICON_NONE); + uiItemR(layout, ptr, "subdivision_type", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "level", 0, IFACE_("Subdivisions"), 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) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c index 2d16b6ead5c..594c9f8ff9f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c @@ -158,25 +158,24 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -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; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int mode = RNA_enum_get(&ptr, "mode"); + int mode = RNA_enum_get(ptr, "mode"); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "mode", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE); if (ELEM(mode, STROKE, STROKE_AND_FILL)) { col = uiLayoutColumn(layout, false); - uiItemR(col, &ptr, "fit_method", 0, IFACE_("Stroke Fit Method"), ICON_NONE); - uiItemR(col, &ptr, "uv_offset", 0, NULL, ICON_NONE); - uiItemR(col, &ptr, "uv_scale", 0, IFACE_("Scale"), ICON_NONE); + uiItemR(col, ptr, "fit_method", 0, IFACE_("Stroke Fit Method"), ICON_NONE); + uiItemR(col, ptr, "uv_offset", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "uv_scale", 0, IFACE_("Scale"), ICON_NONE); } if (mode == STROKE_AND_FILL) { @@ -185,17 +184,17 @@ static void panel_draw(const bContext *C, Panel *panel) if (ELEM(mode, FILL, STROKE_AND_FILL)) { col = uiLayoutColumn(layout, false); - uiItemR(col, &ptr, "fill_rotation", 0, NULL, ICON_NONE); - uiItemR(col, &ptr, "fill_offset", 0, IFACE_("Offset"), ICON_NONE); - uiItemR(col, &ptr, "fill_scale", 0, IFACE_("Scale"), ICON_NONE); + uiItemR(col, ptr, "fill_rotation", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "fill_offset", 0, IFACE_("Offset"), ICON_NONE); + uiItemR(col, ptr, "fill_scale", 0, IFACE_("Scale"), 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, true); + gpencil_modifier_masking_panel_draw(panel, true, true); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 68547614776..20162a2bef2 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -177,30 +177,29 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "normalize_thickness", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "normalize_thickness", 0, NULL, ICON_NONE); - if (RNA_boolean_get(&ptr, "normalize_thickness")) { - uiItemR(layout, &ptr, "thickness", 0, NULL, ICON_NONE); + if (RNA_boolean_get(ptr, "normalize_thickness")) { + uiItemR(layout, ptr, "thickness", 0, NULL, ICON_NONE); } else { - uiItemR(layout, &ptr, "thickness_factor", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "thickness_factor", 0, 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, true); + gpencil_modifier_masking_panel_draw(panel, true, true); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c index 389f3ca1bd2..a4cdd5c2a69 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c @@ -177,73 +177,70 @@ static int remapTime(struct GpencilModifierData *md, return cfra + offset; } -static void panel_draw(const bContext *C, Panel *panel) +static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *row, *col; uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int mode = RNA_enum_get(&ptr, "mode"); + int mode = RNA_enum_get(ptr, "mode"); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "mode", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE); col = uiLayoutColumn(layout, false); const char *text = (mode == GP_TIME_MODE_FIX) ? IFACE_("Frame") : IFACE_("Frame Offset"); - uiItemR(col, &ptr, "offset", 0, text, ICON_NONE); + uiItemR(col, ptr, "offset", 0, text, ICON_NONE); row = uiLayoutRow(col, false); uiLayoutSetActive(row, mode != GP_TIME_MODE_FIX); - uiItemR(row, &ptr, "frame_scale", 0, IFACE_("Scale"), ICON_NONE); + uiItemR(row, ptr, "frame_scale", 0, IFACE_("Scale"), ICON_NONE); row = uiLayoutRow(layout, false); uiLayoutSetActive(row, mode != GP_TIME_MODE_FIX); - uiItemR(row, &ptr, "use_keep_loop", 0, NULL, ICON_NONE); + uiItemR(row, ptr, "use_keep_loop", 0, NULL, ICON_NONE); - gpencil_modifier_panel_end(layout, &ptr); + gpencil_modifier_panel_end(layout, ptr); } -static void custom_range_header_draw(const bContext *C, Panel *panel) +static void custom_range_header_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int mode = RNA_enum_get(&ptr, "mode"); + int mode = RNA_enum_get(ptr, "mode"); uiLayoutSetActive(layout, mode != GP_TIME_MODE_FIX); - uiItemR(layout, &ptr, "use_custom_frame_range", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "use_custom_frame_range", 0, NULL, ICON_NONE); } -static void custom_range_panel_draw(const bContext *C, Panel *panel) +static void custom_range_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col; uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int mode = RNA_enum_get(&ptr, "mode"); + int mode = RNA_enum_get(ptr, "mode"); uiLayoutSetPropSep(layout, true); uiLayoutSetActive( - layout, (mode != GP_TIME_MODE_FIX) && (RNA_boolean_get(&ptr, "use_custom_frame_range"))); + layout, (mode != GP_TIME_MODE_FIX) && (RNA_boolean_get(ptr, "use_custom_frame_range"))); col = uiLayoutColumn(layout, false); - uiItemR(col, &ptr, "frame_start", 0, IFACE_("Frame Start"), ICON_NONE); - uiItemR(col, &ptr, "frame_end", 0, IFACE_("End"), ICON_NONE); + uiItemR(col, ptr, "frame_start", 0, IFACE_("Frame Start"), ICON_NONE); + uiItemR(col, ptr, "frame_end", 0, IFACE_("End"), ICON_NONE); } -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, false, false); + gpencil_modifier_masking_panel_draw(panel, false, false); } static void panelRegister(ARegionType *region_type) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index 9e86ea6ecdc..29baf9daf1a 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -344,40 +344,39 @@ 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 *col; uiLayout *layout = panel->layout; - PointerRNA ptr; - gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL); - int tint_type = RNA_enum_get(&ptr, "tint_type"); + int tint_type = RNA_enum_get(ptr, "tint_type"); uiLayoutSetPropSep(layout, true); - uiItemR(layout, &ptr, "vertex_mode", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "factor", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "tint_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + uiItemR(layout, ptr, "vertex_mode", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "factor", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "tint_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); if (tint_type == GP_TINT_UNIFORM) { - uiItemR(layout, &ptr, "color", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "color", 0, NULL, ICON_NONE); } else { col = uiLayoutColumn(layout, false); uiLayoutSetPropSep(col, false); - uiTemplateColorRamp(col, &ptr, "colors", true); + uiTemplateColorRamp(col, ptr, "colors", true); uiItemS(layout); - uiItemR(layout, &ptr, "object", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "radius", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "radius", 0, 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, true); + gpencil_modifier_masking_panel_draw(panel, true, true); } static void panelRegister(ARegionType *region_type) |