Cleanup: Unindent if statements in sculpt tools code

This removes indentations from if statements by converting them to early
returns and continue.
Most of the code of brushes and tools has loops with a full indented
body inside of an if, which was also copied into some of the new tools.

Reviewed By: JacquesLucke

Differential Revision: https://developer.blender.org/D10333

1 files changed, 113 insertions, 105 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.c b/source/blender/editors/sculpt_paint/sculpt_paint_color.c
index 39320f3f558..5fdf8415f28 100644
--- a/source/blender/editors/sculpt_paint/sculpt_paint_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.c
@@ -87,24 +87,25 @@ static void do_color_smooth_task_cb_exec(void *__restrict userdata,
 
   BKE_pbvh_vertex_iter_begin(ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE)
   {
-    if (sculpt_brush_test_sq_fn(&test, vd.co)) {
-      const float fade = bstrength * SCULPT_brush_strength_factor(ss,
-                                                                  brush,
-                                                                  vd.co,
-                                                                  sqrtf(test.dist),
-                                                                  vd.no,
-                                                                  vd.fno,
-                                                                  vd.mask ? *vd.mask : 0.0f,
-                                                                  vd.index,
-                                                                  thread_id);
-
-      float smooth_color[4];
-      SCULPT_neighbor_color_average(ss, smooth_color, vd.index);
-      blend_color_interpolate_float(vd.col, vd.col, smooth_color, fade);
-
-      if (vd.mvert) {
-        vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-      }
+    if (!sculpt_brush_test_sq_fn(&test, vd.co)) {
+      continue;
+    }
+    const float fade = bstrength * SCULPT_brush_strength_factor(ss,
+                                                                brush,
+                                                                vd.co,
+                                                                sqrtf(test.dist),
+                                                                vd.no,
+                                                                vd.fno,
+                                                                vd.mask ? *vd.mask : 0.0f,
+                                                                vd.index,
+                                                                thread_id);
+
+    float smooth_color[4];
+    SCULPT_neighbor_color_average(ss, smooth_color, vd.index);
+    blend_color_interpolate_float(vd.col, vd.col, smooth_color, fade);
+
+    if (vd.mvert) {
+      vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
     }
   }
   BKE_pbvh_vertex_iter_end;
@@ -153,46 +154,49 @@ static void do_paint_brush_task_cb_ex(void *__restrict userdata,
       distance_to_stroke_location = sqrtf(test.dist);
     }
 
-    if (affect_vertex) {
-      float fade = bstrength * SCULPT_brush_strength_factor(ss,
-                                                            brush,
-                                                            vd.co,
-                                                            distance_to_stroke_location,
-                                                            vd.no,
-                                                            vd.fno,
-                                                            vd.mask ? *vd.mask : 0.0f,
-                                                            vd.index,
-                                                            thread_id);
-
-      /* Density. */
-      float noise = 1.0f;
-      const float density = ss->cache->paint_brush.density;
-      if (density < 1.0f) {
-        const float hash_noise = BLI_hash_int_01(ss->cache->density_seed * 1000 * vd.index);
-        if (hash_noise > density) {
-          noise = density * hash_noise;
-          fade = fade * noise;
-        }
+    if (!affect_vertex) {
+      continue;
+    }
+
+    float fade = bstrength * SCULPT_brush_strength_factor(ss,
+                                                          brush,
+                                                          vd.co,
+                                                          distance_to_stroke_location,
+                                                          vd.no,
+                                                          vd.fno,
+                                                          vd.mask ? *vd.mask : 0.0f,
+                                                          vd.index,
+                                                          thread_id);
+
+    /* Density. */
+    float noise = 1.0f;
+    const float density = ss->cache->paint_brush.density;
+    if (density < 1.0f) {
+      const float hash_noise = BLI_hash_int_01(ss->cache->density_seed * 1000 * vd.index);
+      if (hash_noise > density) {
+        noise = density * hash_noise;
+        fade = fade * noise;
       }
+    }
 
-      /* Brush paint color, brush test falloff and flow. */
-      float paint_color[4];
-      float wet_mix_color[4];
-      float buffer_color[4];
+    /* Brush paint color, brush test falloff and flow. */
+    float paint_color[4];
+    float wet_mix_color[4];
+    float buffer_color[4];
 
-      mul_v4_v4fl(paint_color, brush_color, fade * ss->cache->paint_brush.flow);
-      mul_v4_v4fl(wet_mix_color, data->wet_mix_sampled_color, fade * ss->cache->paint_brush.flow);
+    mul_v4_v4fl(paint_color, brush_color, fade * ss->cache->paint_brush.flow);
+    mul_v4_v4fl(wet_mix_color, data->wet_mix_sampled_color, fade * ss->cache->paint_brush.flow);
 
-      /* Interpolate with the wet_mix color for wet paint mixing. */
-      blend_color_interpolate_float(
-          paint_color, paint_color, wet_mix_color, ss->cache->paint_brush.wet_mix);
-      blend_color_mix_float(color_buffer->color[vd.i], color_buffer->color[vd.i], paint_color);
+    /* Interpolate with the wet_mix color for wet paint mixing. */
+    blend_color_interpolate_float(
+        paint_color, paint_color, wet_mix_color, ss->cache->paint_brush.wet_mix);
+    blend_color_mix_float(color_buffer->color[vd.i], color_buffer->color[vd.i], paint_color);
 
-      /* Final mix over the original color using brush alpha. */
-      mul_v4_v4fl(buffer_color, color_buffer->color[vd.i], brush->alpha);
+    /* Final mix over the original color using brush alpha. */
+    mul_v4_v4fl(buffer_color, color_buffer->color[vd.i], brush->alpha);
+
+    IMB_blend_color_float(vd.col, orig_data.col, buffer_color, brush->blend);
 
-      IMB_blend_color_float(vd.col, orig_data.col, buffer_color, brush->blend);
-    }
     CLAMP4(vd.col, 0.0f, 1.0f);
 
     if (vd.mvert) {
@@ -225,10 +229,12 @@ static void do_sample_wet_paint_task_cb(void *__restrict userdata,
 
   BKE_pbvh_vertex_iter_begin(ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE)
   {
-    if (sculpt_brush_test_sq_fn(&test, vd.co)) {
-      add_v4_v4(swptd->color, vd.col);
-      swptd->tot_samples++;
+    if (!sculpt_brush_test_sq_fn(&test, vd.co)) {
+      continue;
     }
+
+    add_v4_v4(swptd->color, vd.col);
+    swptd->tot_samples++;
   }
   BKE_pbvh_vertex_iter_end;
 }
@@ -380,59 +386,61 @@ static void do_smear_brush_task_cb_exec(void *__restrict userdata,
 
   BKE_pbvh_vertex_iter_begin(ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE)
   {
-    if (sculpt_brush_test_sq_fn(&test, vd.co)) {
-      const float fade = bstrength * SCULPT_brush_strength_factor(ss,
-                                                                  brush,
-                                                                  vd.co,
-                                                                  sqrtf(test.dist),
-                                                                  vd.no,
-                                                                  vd.fno,
-                                                                  vd.mask ? *vd.mask : 0.0f,
-                                                                  vd.index,
-                                                                  thread_id);
-
-      float current_disp[3];
-      float current_disp_norm[3];
-      float interp_color[4];
-      copy_v4_v4(interp_color, ss->cache->prev_colors[vd.index]);
-
-      switch (brush->smear_deform_type) {
-        case BRUSH_SMEAR_DEFORM_DRAG:
-          sub_v3_v3v3(current_disp, ss->cache->location, ss->cache->last_location);
-          break;
-        case BRUSH_SMEAR_DEFORM_PINCH:
-          sub_v3_v3v3(current_disp, ss->cache->location, vd.co);
-          break;
-        case BRUSH_SMEAR_DEFORM_EXPAND:
-          sub_v3_v3v3(current_disp, vd.co, ss->cache->location);
-          break;
-      }
-      normalize_v3_v3(current_disp_norm, current_disp);
-      mul_v3_v3fl(current_disp, current_disp_norm, ss->cache->bstrength);
-
-      SculptVertexNeighborIter ni;
-      SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, vd.index, ni) {
-        float vertex_disp[3];
-        float vertex_disp_norm[3];
-        sub_v3_v3v3(vertex_disp, SCULPT_vertex_co_get(ss, ni.index), vd.co);
-        const float *neighbor_color = ss->cache->prev_colors[ni.index];
-        normalize_v3_v3(vertex_disp_norm, vertex_disp);
-        if (dot_v3v3(current_disp_norm, vertex_disp_norm) < 0.0f) {
-          const float color_interp = clamp_f(
-              -dot_v3v3(current_disp_norm, vertex_disp_norm), 0.0f, 1.0f);
-          float color_mix[4];
-          copy_v4_v4(color_mix, neighbor_color);
-          mul_v4_fl(color_mix, color_interp * fade);
-          blend_color_mix_float(interp_color, interp_color, color_mix);
-        }
+    if (!sculpt_brush_test_sq_fn(&test, vd.co)) {
+      continue;
+    }
+    const float fade = bstrength * SCULPT_brush_strength_factor(ss,
+                                                                brush,
+                                                                vd.co,
+                                                                sqrtf(test.dist),
+                                                                vd.no,
+                                                                vd.fno,
+                                                                vd.mask ? *vd.mask : 0.0f,
+                                                                vd.index,
+                                                                thread_id);
+
+    float current_disp[3];
+    float current_disp_norm[3];
+    float interp_color[4];
+    copy_v4_v4(interp_color, ss->cache->prev_colors[vd.index]);
+
+    switch (brush->smear_deform_type) {
+      case BRUSH_SMEAR_DEFORM_DRAG:
+        sub_v3_v3v3(current_disp, ss->cache->location, ss->cache->last_location);
+        break;
+      case BRUSH_SMEAR_DEFORM_PINCH:
+        sub_v3_v3v3(current_disp, ss->cache->location, vd.co);
+        break;
+      case BRUSH_SMEAR_DEFORM_EXPAND:
+        sub_v3_v3v3(current_disp, vd.co, ss->cache->location);
+        break;
+    }
+    normalize_v3_v3(current_disp_norm, current_disp);
+    mul_v3_v3fl(current_disp, current_disp_norm, ss->cache->bstrength);
+
+    SculptVertexNeighborIter ni;
+    SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, vd.index, ni) {
+      float vertex_disp[3];
+      float vertex_disp_norm[3];
+      sub_v3_v3v3(vertex_disp, SCULPT_vertex_co_get(ss, ni.index), vd.co);
+      const float *neighbor_color = ss->cache->prev_colors[ni.index];
+      normalize_v3_v3(vertex_disp_norm, vertex_disp);
+      if (dot_v3v3(current_disp_norm, vertex_disp_norm) >= 0.0f) {
+        continue;
       }
-      SCULPT_VERTEX_NEIGHBORS_ITER_END(ni);
+      const float color_interp = clamp_f(
+          -dot_v3v3(current_disp_norm, vertex_disp_norm), 0.0f, 1.0f);
+      float color_mix[4];
+      copy_v4_v4(color_mix, neighbor_color);
+      mul_v4_fl(color_mix, color_interp * fade);
+      blend_color_mix_float(interp_color, interp_color, color_mix);
+    }
+    SCULPT_VERTEX_NEIGHBORS_ITER_END(ni);
 
-      blend_color_interpolate_float(vd.col, ss->cache->prev_colors[vd.index], interp_color, fade);
+    blend_color_interpolate_float(vd.col, ss->cache->prev_colors[vd.index], interp_color, fade);
 
-      if (vd.mvert) {
-        vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-      }
+    if (vd.mvert) {
+      vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
     }
   }
   BKE_pbvh_vertex_iter_end;