archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Interface, Clang-Tidy else-after-return fixes

Browse Source 
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/editors/interface` module.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2020-07-03 14:20:10 +02:00
parent 86e7648f0e
commit f3b8792b96
26 changed files with 439 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/interface/view2d.c
View File

@@ -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;
}
/** \} */