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

1 files changed, 7 insertions, 2 deletions

diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c
index c30992fa296..b4c2c3f091e 100644
--- a/source/blender/bmesh/tools/bmesh_region_match.c
+++ b/source/blender/bmesh/tools/bmesh_region_match.c
@@ -921,6 +921,11 @@ static void bm_face_array_visit(BMFace **faces,
 /* signed user id */
 typedef intptr_t SUID_Int;
 
+BLI_INLINE intptr_t abs_intptr(intptr_t a)
+{
+  return (a < 0) ? -a : a;
+}
+
 static bool bm_edge_is_region_boundary(BMEdge *e)
 {
   if (e->l->radial_next != e->l) {
@@ -984,7 +989,7 @@ static SUID_Int bm_face_region_vert_boundary_id(BMVert *v)
 
   id ^= (tot * PRIME_VERT_MID_B);
 
-  return id ? ABS(id) : 1;
+  return id ? abs_intptr(id) : 1;
 
 #  undef PRIME_VERT_SMALL_A
 #  undef PRIME_VERT_SMALL_B
@@ -1039,7 +1044,7 @@ static SUID_Int bm_face_region_vert_pass_id(GHash *gh, BMVert *v)
   /* disallow 0 & min (since it can't be flipped) */
   id = (UNLIKELY(id == 0) ? 1 : UNLIKELY(id < id_min) ? id_min : id);
 
-  return ABS(id);
+  return abs_intptr(id);
 
 #  undef PRIME_VERT_MID_A
 #  undef PRIME_VERT_MID_B