diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-03-06 19:18:10 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-03-09 16:47:59 +0300 |
commit | 598ab525da3df3fef2033c159c570688c7282a8f (patch) | |
tree | ba2bd0b8fc6ee5d264512bf655def1a6ee5d7b31 /source/blender/editors/screen/area.c | |
parent | ee5d7bc16b243f309c84bce5deddf3a86b7f4c14 (diff) |
Cleanup: Replace ABS/SQUARE/CUBE with function calls
While it might be handy to have type-less functionality which is
similar to how C++ math is implemented it can not be easily achieved
with just preprocessor in a way which does not have side-effects on
wrong usage.
There macros where often used on a non-trivial expression, and there
was at least one usage where it was causing an actual side effect/bug
on Windows (see change around square_f(sh[index++]) in studiolight.c).
For such cases it is handy to have a function which is guaranteed to
have zero side-effects. The motivation behind actually removing the
macros is that there is already a way to do similar calculation. Also,
not having such macros is a way to guarantee that its usage is not
changed in a way which have side-effects and that it's not used as an
inspiration for cases where it should not be used.
Differential Revision: https://developer.blender.org/D7051
Diffstat (limited to 'source/blender/editors/screen/area.c')
-rw-r--r-- | source/blender/editors/screen/area.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 85d84ad6864..e72818479c4 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -2533,7 +2533,7 @@ void ED_region_panels_layout_ex(const bContext *C, region->sizey = size_dyn[1]; sa->flag |= AREA_FLAG_REGION_SIZE_UPDATE; } - y = ABS(region->sizey * UI_DPI_FAC - 1); + y = fabsf(region->sizey * UI_DPI_FAC - 1); } } else if (vertical) { @@ -3390,21 +3390,21 @@ static void region_visible_rect_calc(ARegion *region, rcti *rect) if (ELEM(alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) { /* Overlap left, also check 1 pixel offset (2 regions on one side). */ - if (ABS(rect->xmin - arn->winrct.xmin) < 2) { + if (abs(rect->xmin - arn->winrct.xmin) < 2) { rect->xmin = arn->winrct.xmax; } /* Overlap right. */ - if (ABS(rect->xmax - arn->winrct.xmax) < 2) { + if (abs(rect->xmax - arn->winrct.xmax) < 2) { rect->xmax = arn->winrct.xmin; } } else if (ELEM(alignment, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) { /* Same logic as above for vertical regions. */ - if (ABS(rect->ymin - arn->winrct.ymin) < 2) { + if (abs(rect->ymin - arn->winrct.ymin) < 2) { rect->ymin = arn->winrct.ymax; } - if (ABS(rect->ymax - arn->winrct.ymax) < 2) { + if (abs(rect->ymax - arn->winrct.ymax) < 2) { rect->ymax = arn->winrct.ymin; } } |