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 15:20:10 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-07-03 15:48:37 +0300
commitf3b8792b963b0b2a00fe7fe173f1beb85c209fbb (patch)
tree55ffa18ad4a6f2f03a127469780d47c54ad9bd74 /source/blender/editors/interface/view2d.c
parent86e7648f0edc13d613d8fc39af7758e08cfdf9e2 (diff)
Cleanup: Interface, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/interface` module. No functional changes.
Diffstat (limited to 'source/blender/editors/interface/view2d.c')
-rw-r--r--source/blender/editors/interface/view2d.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index d696c99851b..0cbf73280a3 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -74,12 +74,10 @@ BLI_INLINE int clamp_float_to_int(const float f)
if (UNLIKELY(f < min)) {
return min;
}
- else if (UNLIKELY(f > max)) {
+ if (UNLIKELY(f > max)) {
return (int)max;
}
- else {
- return (int)f;
- }
+ return (int)f;
}
/**
@@ -1756,12 +1754,11 @@ bool UI_view2d_view_to_region_clip(
return true;
}
- else {
- /* set initial value in case coordinate lies outside of bounds */
- *r_region_x = *r_region_y = V2D_IS_CLIPPED;
- return false;
- }
+ /* set initial value in case coordinate lies outside of bounds */
+ *r_region_x = *r_region_y = V2D_IS_CLIPPED;
+
+ return false;
}
/**
@@ -1855,11 +1852,9 @@ bool UI_view2d_view_to_region_rcti_clip(const View2D *v2d, const rctf *rect_src,
return true;
}
- else {
- rect_dst->xmin = rect_dst->xmax = rect_dst->ymin = rect_dst->ymax = V2D_IS_CLIPPED;
- return false;
- }
+ rect_dst->xmin = rect_dst->xmax = rect_dst->ymin = rect_dst->ymax = V2D_IS_CLIPPED;
+ return false;
}
/** \} */