From fd5b093f84845ab7adbe7e6e4dec4bbadbbc16af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 3 Jul 2020 16:01:15 +0200 Subject: Cleanup: Editors/Screen, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/screen` module. No functional changes. --- source/blender/editors/screen/screen_geometry.c | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'source/blender/editors/screen/screen_geometry.c') diff --git a/source/blender/editors/screen/screen_geometry.c b/source/blender/editors/screen/screen_geometry.c index 47580c2f4b3..0b83a657265 100644 --- a/source/blender/editors/screen/screen_geometry.c +++ b/source/blender/editors/screen/screen_geometry.c @@ -327,27 +327,26 @@ short screen_geom_find_area_split_point(const ScrArea *area, return y; } - else { - x = area->v1->vec.x + round_fl_to_short(fac * cur_area_width); - area_min = area_min_x; + x = area->v1->vec.x + round_fl_to_short(fac * cur_area_width); - if (area->v1->vec.x > window_rect->xmin) { - area_min += U.pixelsize; - } - if (area->v4->vec.x < (window_rect->xmax - 1)) { - area_min += U.pixelsize; - } + area_min = area_min_x; - if (x - area->v1->vec.x < area_min) { - x = area->v1->vec.x + area_min; - } - else if (area->v4->vec.x - x < area_min) { - x = area->v4->vec.x - area_min; - } + if (area->v1->vec.x > window_rect->xmin) { + area_min += U.pixelsize; + } + if (area->v4->vec.x < (window_rect->xmax - 1)) { + area_min += U.pixelsize; + } - return x; + if (x - area->v1->vec.x < area_min) { + x = area->v1->vec.x + area_min; } + else if (area->v4->vec.x - x < area_min) { + x = area->v4->vec.x - area_min; + } + + return x; } /** -- cgit v1.2.3