diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-05-13 18:28:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-13 18:33:27 +0300 |
commit | 141c0f8ad1f23870e29b58566d71bd912625e93e (patch) | |
tree | 07d2314b24bf1565042a18cdff1a4d8ed997abb4 /source/blender/blenkernel/intern/dynamicpaint.c | |
parent | a91a49ba8e3de3879688e9ca9c2289c231965cf2 (diff) |
Cleanup: rna naming, indentation
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 1bed13778ca..18672b93714 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -2305,10 +2305,10 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface) /* Check uv bb */ if ((faceBB[i].min[0] > (point[sample][0])) || (faceBB[i].min[1] > (point[sample][1])) || - (faceBB[i].max[0] < (point[sample][0])) || - (faceBB[i].max[1] < (point[sample][1]))) + (faceBB[i].max[0] < (point[sample][0])) || + (faceBB[i].max[1] < (point[sample][1]))) { - continue; + continue; } const float *uv1 = mloopuv[mlooptri[i].tri[0]].uv; @@ -3584,7 +3584,8 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface, /* Proceed only if particle is active */ if ((pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN) == 0) || (pa->alive == PARS_DEAD && (part->flag & PART_DIED) == 0) || - (pa->flag & PARS_UNEXIST)) { + (pa->flag & PARS_UNEXIST)) + { continue; } @@ -3858,7 +3859,8 @@ static int dynamicPaint_paintSinglePoint( /* color ramp */ if (brush->proximity_falloff == MOD_DPAINT_PRFALL_RAMP && - do_colorband(brush->paint_ramp, (1.0f - strength), colorband)) { + do_colorband(brush->paint_ramp, (1.0f - strength), colorband)) + { strength = colorband[3]; } |