Merge branch 'master' into property-search-uiproperty-search-ui

1 files changed, 32 insertions, 38 deletions

diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index 01d44d070b3..92885535f57 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -354,43 +354,38 @@ static bool layer_bucket_isect_test(const MaskRasterLayer *layer,
     if (isect_point_tri_v2(cent, v1, v2, v3)) {
       return true;
     }
-    else {
-      if ((dist_squared_to_line_segment_v2(cent, v1, v2) < bucket_max_rad_squared) ||
-          (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
-          (dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared)) {
-        return true;
-      }
-      else {
-        // printf("skip tri\n");
-        return false;
-      }
-    }
-  }
-  else {
-    const float *v1 = cos[face[0]];
-    const float *v2 = cos[face[1]];
-    const float *v3 = cos[face[2]];
-    const float *v4 = cos[face[3]];
 
-    if (isect_point_tri_v2(cent, v1, v2, v3)) {
+    if ((dist_squared_to_line_segment_v2(cent, v1, v2) < bucket_max_rad_squared) ||
+        (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
+        (dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared)) {
       return true;
     }
-    else if (isect_point_tri_v2(cent, v1, v3, v4)) {
-      return true;
-    }
-    else {
-      if ((dist_squared_to_line_segment_v2(cent, v1, v2) < bucket_max_rad_squared) ||
-          (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
-          (dist_squared_to_line_segment_v2(cent, v3, v4) < bucket_max_rad_squared) ||
-          (dist_squared_to_line_segment_v2(cent, v4, v1) < bucket_max_rad_squared)) {
-        return true;
-      }
-      else {
-        // printf("skip quad\n");
-        return false;
-      }
-    }
+
+    // printf("skip tri\n");
+    return false;
+  }
+
+  const float *v1 = cos[face[0]];
+  const float *v2 = cos[face[1]];
+  const float *v3 = cos[face[2]];
+  const float *v4 = cos[face[3]];
+
+  if (isect_point_tri_v2(cent, v1, v2, v3)) {
+    return true;
+  }
+  if (isect_point_tri_v2(cent, v1, v3, v4)) {
+    return true;
   }
+
+  if ((dist_squared_to_line_segment_v2(cent, v1, v2) < bucket_max_rad_squared) ||
+      (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
+      (dist_squared_to_line_segment_v2(cent, v3, v4) < bucket_max_rad_squared) ||
+      (dist_squared_to_line_segment_v2(cent, v4, v1) < bucket_max_rad_squared)) {
+    return true;
+  }
+
+  // printf("skip quad\n");
+  return false;
 }
 
 static void layer_bucket_init_dummy(MaskRasterLayer *layer)
@@ -791,7 +786,7 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle,
             co_feather[2] = 1.0f;
 
             if (spline->flag & MASK_SPLINE_NOINTERSECT) {
-              diff_feather_points_flip = MEM_mallocN(sizeof(float) * 2 * tot_diff_feather_points,
+              diff_feather_points_flip = MEM_mallocN(sizeof(float[2]) * tot_diff_feather_points,
                                                      "diff_feather_points_flip");
 
               for (j = 0; j < tot_diff_point; j++) {
@@ -944,7 +939,7 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle,
       ListBase isect_remedgebase = {NULL, NULL};
 
       /* now we have all the splines */
-      face_coords = MEM_mallocN((sizeof(float) * 3) * sf_vert_tot, "maskrast_face_coords");
+      face_coords = MEM_mallocN((sizeof(float[3])) * sf_vert_tot, "maskrast_face_coords");
 
       /* init bounds */
       BLI_rctf_init_minmax(&bounds);
@@ -1348,9 +1343,8 @@ static float layer_bucket_depth_from_xy(MaskRasterLayer *layer, const float xy[2
     }
     return best_dist;
   }
-  else {
-    return 1.0f;
-  }
+
+  return 1.0f;
 }
 
 float BKE_maskrasterize_handle_sample(MaskRasterHandle *mr_handle, const float xy[2])