[Bf-blender-cvs] [57e763d] compositor-2016: Cleanup: misleading indentation

[Campbell Barton]

Commit: 57e763d24d6ed08dbbd196f16e3a2cd3237a0f96
Author: Campbell Barton
Date:   Thu May 19 23:37:23 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rB57e763d24d6ed08dbbd196f16e3a2cd3237a0f96

Cleanup: misleading indentation

===================================================================

M	source/blender/blenkernel/intern/dynamicpaint.c

===================================================================

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 6b39dea..9e384eb 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;