diff options
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_merge.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_merge.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/editors/gpencil/gpencil_merge.c b/source/blender/editors/gpencil/gpencil_merge.c index e71bf2098dd..53dbc1620d0 100644 --- a/source/blender/editors/gpencil/gpencil_merge.c +++ b/source/blender/editors/gpencil/gpencil_merge.c @@ -73,7 +73,8 @@ static int gpencil_sort_points(const void *a1, const void *a2) if (ps1->factor < ps2->factor) { return -1; } - else if (ps1->factor > ps2->factor) { + + if (ps1->factor > ps2->factor) { return 1; } @@ -132,7 +133,7 @@ static bGPDstroke *gpencil_prepare_stroke(bContext *C, wmOperator *op, int totpo bGPDframe *gpf = BKE_gpencil_layer_frame_get(gpl, CFRA, add_frame_mode); /* stroke */ - bGPDstroke *gps = BKE_gpencil_stroke_new(ob->actcol - 1, totpoints, brush->size); + bGPDstroke *gps = BKE_gpencil_stroke_new(MAX2(ob->actcol - 1, 0), totpoints, brush->size); gps->flag |= GP_STROKE_SELECT; if (cyclic) { @@ -178,7 +179,7 @@ static void gpencil_dissolve_points(bContext *C) } LISTBASE_FOREACH_MUTABLE (bGPDstroke *, gps, &gpf->strokes) { - gp_stroke_delete_tagged_points(gpf, gps, gps->next, GP_SPOINT_TAG, false, 0); + gpencil_stroke_delete_tagged_points(gpf, gps, gps->next, GP_SPOINT_TAG, false, 0); } } CTX_DATA_END; @@ -431,7 +432,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 +463,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 +547,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 +564,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 +575,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 +643,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; |