diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-15 01:08:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-15 03:35:03 +0300 |
commit | ca3628ba0c327b730554bb8cb79584ef929c226f (patch) | |
tree | 947195407b18bc65e5e3cd2d4ede28ec8da0f7b5 /source | |
parent | 83d4328ce75c1ef8eb62fa3ed915ffd068366dfe (diff) |
Cleanup: style
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/multires_reshape.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 3 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index 782c7638b58..530f5388da6 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -332,7 +332,7 @@ static void multires_reshape_vertex( ptex_face_index, u, v, coarse_poly_index, coarse_corner, - final_P); + final_P); } static void multires_reshape_vertex_inner( diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 640fc194731..ea346a3bfda 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1341,7 +1341,8 @@ void BKE_pbvh_get_grid_key(const PBVH *bvh, CCGKey *key) *key = bvh->gridkey; } -struct CCGElem **BKE_pbvh_get_grids(const PBVH *bvh, int *num_grids) { +struct CCGElem **BKE_pbvh_get_grids(const PBVH *bvh, int *num_grids) +{ BLI_assert(bvh->type == PBVH_GRIDS); *num_grids = bvh->totgrid; return bvh->grids; diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 93c987a4ee8..84fa842efa7 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1363,7 +1363,7 @@ static void gp_stroke_soft_refine(bGPDstroke *gps, const float cull_thresh) /* if any of the side points are not tagged, mark to keep */ if (((pt_before->flag & GP_SPOINT_TAG) == 0) || - ((pt_after->flag & GP_SPOINT_TAG) == 0)) + ((pt_after->flag & GP_SPOINT_TAG) == 0)) { if (pt->pressure > cull_thresh) { pt->flag |= GP_SPOINT_TEMP_TAG; @@ -1486,7 +1486,7 @@ static void gp_stroke_eraser_dostroke(tGPsdata *p, */ for (i = 0; (i + 1) < gps->totpoints; i++) { /* get points to work with */ - pt0 = i > 0 ? gps->points + i - 1: NULL; + pt0 = i > 0 ? gps->points + i - 1 : NULL; pt1 = gps->points + i; pt2 = gps->points + i + 1; @@ -1512,7 +1512,7 @@ static void gp_stroke_eraser_dostroke(tGPsdata *p, /* Check that point segment of the boundbox of the eraser stroke */ if (((!ELEM(V2D_IS_CLIPPED, pc0[0], pc0[1])) && BLI_rcti_isect_pt(rect, pc0[0], pc0[1])) || - ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) || + ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) || ((!ELEM(V2D_IS_CLIPPED, pc2[0], pc2[1])) && BLI_rcti_isect_pt(rect, pc2[0], pc2[1]))) { /* Check if point segment of stroke had anything to do with @@ -1521,7 +1521,7 @@ static void gp_stroke_eraser_dostroke(tGPsdata *p, */ if (gp_stroke_inside_circle(mval, mvalo, radius, pc0[0], pc0[1], pc2[0], pc2[1])) { if ((gp_stroke_eraser_is_occluded(p, pt0, pc0[0], pc0[1]) == false) || - (gp_stroke_eraser_is_occluded(p, pt1, pc1[0], pc1[1]) == false) || + (gp_stroke_eraser_is_occluded(p, pt1, pc1[0], pc1[1]) == false) || (gp_stroke_eraser_is_occluded(p, pt2, pc2[0], pc2[1]) == false)) { /* Point is affected: */ @@ -1551,8 +1551,8 @@ static void gp_stroke_eraser_dostroke(tGPsdata *p, /* if invisible, delete point */ if ((pt0) && - ((pt0->strength <= GPENCIL_ALPHA_OPACITY_THRESH) - || (pt0->pressure < cull_thresh))) + ((pt0->strength <= GPENCIL_ALPHA_OPACITY_THRESH) || + (pt0->pressure < cull_thresh))) { pt0->flag |= GP_SPOINT_TAG; do_cull = true; |