diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-19 16:37:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-19 16:37:23 +0300 |
| commit | c5893db5cc70be12e65632ab673320f8765161f1 (patch) | |
| tree | a8f13c60bf03ac9b286b322e2de070ee3666db95 | |
| parent | a4a968fd99c0bf473f022a00b6cc756ee9d429cb (diff) | |
Cleanup: misleading indentation
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 6b39dea0cfa..9e384ebbc17 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3277,7 +3277,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, nearest.dist_sq = brush_radius * brush_radius; /* find_nearest uses squared distance */ /* Check volume collision */ - if (brush->collision == MOD_DPAINT_COL_VOLUME || brush->collision == MOD_DPAINT_COL_VOLDIST) + if (ELEM(brush->collision, MOD_DPAINT_COL_VOLUME, MOD_DPAINT_COL_VOLDIST)) { BLI_bvhtree_ray_cast(treeData.tree, ray_start, ray_dir, 0.0f, &hit, mesh_tris_spherecast_dp, &treeData); if (hit.index != -1) { @@ -3321,9 +3321,10 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, } } } + } /* Check proximity collision */ - if ((brush->collision == MOD_DPAINT_COL_DIST || brush->collision == MOD_DPAINT_COL_VOLDIST) && + if (ELEM(brush->collision, MOD_DPAINT_COL_DIST, MOD_DPAINT_COL_VOLDIST) && (!hit_found || (brush->flags & MOD_DPAINT_INVERSE_PROX))) { float proxDist = -1.0f; |