diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 00:47:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 02:36:52 +0300 |
| commit | 8c3bd1eda1a2f35e28773f18c879f5f8f971b306 (patch) | |
| tree | 989d8d12e7c7539ad2625329d7921971063de7a7 /source/blender/editors/gpencil/gpencil_edit.c | |
| parent | ee0c2e9b870ced1d5ed720b8c4e160b7058f147c (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_edit.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 72f65ce8a37..5c6f7de9426 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -2545,14 +2545,21 @@ static int gp_stroke_caps_set_exec(bContext *C, wmOperator *op) MaterialGPencilStyle *gp_style = BKE_material_gpencil_settings_get(ob, gps->mat_nr + 1); /* skip strokes that are not selected or invalid for current view */ - if (((gps->flag & GP_STROKE_SELECT) == 0) || ED_gpencil_stroke_can_use(C, gps) == false) + if (((gps->flag & GP_STROKE_SELECT) == 0) || + (ED_gpencil_stroke_can_use(C, gps) == false)) + { continue; + } /* skip hidden or locked colors */ - if (!gp_style || (gp_style->flag & GP_STYLE_COLOR_HIDE) || (gp_style->flag & GP_STYLE_COLOR_LOCKED)) + if (!gp_style || + (gp_style->flag & GP_STYLE_COLOR_HIDE) || + (gp_style->flag & GP_STYLE_COLOR_LOCKED)) + { continue; + } if ((type == GP_STROKE_CAPS_TOGGLE_BOTH) || - (type == GP_STROKE_CAPS_TOGGLE_START)) + (type == GP_STROKE_CAPS_TOGGLE_START)) { ++gps->caps[0]; if (gps->caps[0] >= GP_STROKE_CAP_MAX) { @@ -2560,7 +2567,7 @@ static int gp_stroke_caps_set_exec(bContext *C, wmOperator *op) } } if ((type == GP_STROKE_CAPS_TOGGLE_BOTH) || - (type == GP_STROKE_CAPS_TOGGLE_END)) + (type == GP_STROKE_CAPS_TOGGLE_END)) { ++gps->caps[1]; if (gps->caps[1] >= GP_STROKE_CAP_MAX) { @@ -3851,7 +3858,7 @@ static void gpencil_cutter_dissolve(bGPDlayer *hit_layer, bGPDstroke *hit_stroke /* if all points selected delete or only 2 points and 1 selected */ if (((totselect == 1) && (hit_stroke->totpoints == 2)) || - (hit_stroke->totpoints == totselect)) + (hit_stroke->totpoints == totselect)) { BLI_remlink(&hit_layer->actframe->strokes, hit_stroke); BKE_gpencil_free_stroke(hit_stroke); @@ -3950,7 +3957,7 @@ static int gpencil_cutter_lasso_select( } /* if mark all points inside lasso set to remove all stroke */ if ((tot_inside == oldtot) || - ((tot_inside == 1) && (oldtot == 2))) + ((tot_inside == 1) && (oldtot == 2))) { for (i = 0; i < gps->totpoints; i++) { pt = &gps->points[i]; |