diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 07:02:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 07:07:10 +0300 |
| commit | 3437cd9ac22e0a5ae611454ae6f36f24697774c8 (patch) | |
| tree | b800b58228718aaeb72139d0b04ce6f33e777b55 /source/blender/editors/gpencil/gpencil_edit.c | |
| parent | 184ab749c38a6e90744022a030bec6a6ee584a0a (diff) | |
Cleanup: add arg to GP_EDITABLE_STROKES macro
Without this, we use arguments defined in the macro
making code hard to read.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_edit.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index cb735b69ec2..383b4335f3b 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -2883,7 +2883,7 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) // TODO: For deforming geometry workflow, create new frames? /* Go through each editable + selected stroke, adjusting each of its points one by one... */ - GP_EDITABLE_STROKES_BEGIN(C, gpl, gps) + GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) { if (gps->flag & GP_STROKE_SELECT) { bGPDspoint *pt; @@ -2892,7 +2892,7 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) /* Compute inverse matrix for unapplying parenting once instead of doing per-point */ /* TODO: add this bit to the iteration macro? */ - invert_m4_m4(inverse_diff_mat, diff_mat); + invert_m4_m4(inverse_diff_mat, gpstroke_iter.diff_mat); /* Adjust each point */ for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) { @@ -2904,7 +2904,7 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) * artifacts in the final points. */ bGPDspoint pt2; - gp_point_to_parent_space(pt, diff_mat, &pt2); + gp_point_to_parent_space(pt, gpstroke_iter.diff_mat, &pt2); gp_point_to_xy_fl(&gsc, gps, &pt2, &xy[0], &xy[1]); /* Project stroke in the axis locked */ @@ -2953,7 +2953,7 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) } } } - GP_EDITABLE_STROKES_END; + GP_EDITABLE_STROKES_END(gpstroke_iter); DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA); WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL); @@ -3028,7 +3028,7 @@ static int gp_stroke_subdivide_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* Go through each editable + selected stroke */ - GP_EDITABLE_STROKES_BEGIN(C, gpl, gps) + GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) { if (gps->flag & GP_STROKE_SELECT) { /* loop as many times as cuts */ @@ -3126,7 +3126,7 @@ static int gp_stroke_subdivide_exec(bContext *C, wmOperator *op) } } } - GP_EDITABLE_STROKES_END; + GP_EDITABLE_STROKES_END(gpstroke_iter); /* notifiers */ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA); @@ -3169,14 +3169,14 @@ static int gp_stroke_simplify_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* Go through each editable + selected stroke */ - GP_EDITABLE_STROKES_BEGIN(C, gpl, gps) + GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) { if (gps->flag & GP_STROKE_SELECT) { /* simplify stroke using Ramer-Douglas-Peucker algorithm */ BKE_gpencil_simplify_stroke(gps, factor); } } - GP_EDITABLE_STROKES_END; + GP_EDITABLE_STROKES_END(gpstroke_iter); /* notifiers */ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA); @@ -3218,7 +3218,7 @@ static int gp_stroke_simplify_fixed_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* Go through each editable + selected stroke */ - GP_EDITABLE_STROKES_BEGIN(C, gpl, gps) + GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) { if (gps->flag & GP_STROKE_SELECT) { for (int i = 0; i < steps; i++) { @@ -3226,7 +3226,7 @@ static int gp_stroke_simplify_fixed_exec(bContext *C, wmOperator *op) } } } - GP_EDITABLE_STROKES_END; + GP_EDITABLE_STROKES_END(gpstroke_iter); /* notifiers */ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA); |