Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-07-03 17:01:15 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-07-03 17:15:01 +0300
commitfd5b093f84845ab7adbe7e6e4dec4bbadbbc16af (patch)
tree80e57d3d29d38afc67e89c7c6014687f5a749c63 /source/blender/editors/screen/screen_geometry.c
parent4283da83cc9e307e6e5ce03916bb08a2adb02eba (diff)
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.
Diffstat (limited to 'source/blender/editors/screen/screen_geometry.c')
-rw-r--r--source/blender/editors/screen/screen_geometry.c31
1 files changed, 15 insertions, 16 deletions
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;
}
/**