diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 13:30:43 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 14:38:06 +0300 |
commit | 1b272a649b40e99dba4185167f6cee7cbece1942 (patch) | |
tree | 2785f52c566b36cbdcbf9355f698dc520ffbb482 /source/blender/blenkernel/intern/mask_rasterize.c | |
parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) |
Cleanup: Blenkernel, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/blenkernel` module.
No functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/mask_rasterize.c')
-rw-r--r-- | source/blender/blenkernel/intern/mask_rasterize.c | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index 01d44d070b3..b28cd9c6c8e 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) @@ -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]) |