griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-09-15 08:08:43 +10:00
parent 83d4328ce7
commit ca3628ba0c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/multires_reshape.c
View File

@@ -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(

3
source/blender/blenkernel/intern/pbvh.c
View File

@@ -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;

12
source/blender/editors/gpencil/gpencil_paint.c
View File

@@ -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;