diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-06-29 16:28:38 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-06-29 16:47:43 +0300 |
| commit | a351eb072658ce6fb84290f80d8f17bb397fb7ff (patch) | |
| tree | 8db60cbddbafddd69ceb2f9b3ad32fa82a8dc022 /source/blender/editors/gpencil/gpencil_merge.c | |
| parent | 399dbb1aa391f04357f91ab875241db3c6041aa5 (diff) | |
GPencil: Cleanup function names replace gp_ by gpencil_ prefix
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_merge.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_merge.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/gpencil/gpencil_merge.c b/source/blender/editors/gpencil/gpencil_merge.c index 26eec030803..cf806e68837 100644 --- a/source/blender/editors/gpencil/gpencil_merge.c +++ b/source/blender/editors/gpencil/gpencil_merge.c @@ -431,7 +431,7 @@ static int gpencil_analyze_strokes(tGPencilPointCache *src_array, return last; } -static bool gp_strokes_merge_poll(bContext *C) +static bool gpencil_strokes_merge_poll(bContext *C) { /* only supported with grease pencil objects */ Object *ob = CTX_data_active_object(C); @@ -462,7 +462,7 @@ static bool gp_strokes_merge_poll(bContext *C) return (CTX_DATA_COUNT(C, editable_gpencil_strokes) != 0) && ED_operator_view3d_active(C); } -static int gp_stroke_merge_exec(bContext *C, wmOperator *op) +static int gpencil_stroke_merge_exec(bContext *C, wmOperator *op) { const int mode = RNA_enum_get(op->ptr, "mode"); const bool clear_point = RNA_boolean_get(op->ptr, "clear_point"); @@ -546,8 +546,8 @@ void GPENCIL_OT_stroke_merge(wmOperatorType *ot) ot->description = "Create a new stroke with the selected stroke points"; /* api callbacks */ - ot->exec = gp_stroke_merge_exec; - ot->poll = gp_strokes_merge_poll; + ot->exec = gpencil_stroke_merge_exec; + ot->poll = gpencil_strokes_merge_poll; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -563,7 +563,7 @@ void GPENCIL_OT_stroke_merge(wmOperatorType *ot) } /* Merge similar materials. */ -static bool gp_stroke_merge_material_poll(bContext *C) +static bool gpencil_stroke_merge_material_poll(bContext *C) { /* only supported with grease pencil objects */ Object *ob = CTX_data_active_object(C); @@ -574,7 +574,7 @@ static bool gp_stroke_merge_material_poll(bContext *C) return true; } -static int gp_stroke_merge_material_exec(bContext *C, wmOperator *op) +static int gpencil_stroke_merge_material_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_active_object(C); bGPdata *gpd = (bGPdata *)ob->data; @@ -642,8 +642,8 @@ void GPENCIL_OT_stroke_merge_material(wmOperatorType *ot) ot->description = "Replace materials in strokes merging similar"; /* api callbacks */ - ot->exec = gp_stroke_merge_material_exec; - ot->poll = gp_stroke_merge_material_poll; + ot->exec = gpencil_stroke_merge_material_exec; + ot->poll = gpencil_stroke_merge_material_poll; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; |