From 598ab525da3df3fef2033c159c570688c7282a8f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 6 Mar 2020 17:18:10 +0100 Subject: 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 --- source/blender/bmesh/intern/bmesh_edgeloop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/bmesh/intern') diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c index 49c71bf8298..c07bae5e3f2 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.c +++ b/source/blender/bmesh/intern/bmesh_edgeloop.c @@ -82,7 +82,7 @@ static bool bm_loop_build(BMEdgeLoopStore *el_store, BMVert *v_prev, BMVert *v, BMVert *v_next; BMVert *v_first = v; - BLI_assert(ABS(dir) == 1); + BLI_assert(abs(dir) == 1); if (!BM_elem_flag_test(v, BM_ELEM_INTERNAL_TAG)) { return true; @@ -224,7 +224,7 @@ static bool bm_loop_path_build_step(BLI_mempool *vs_pool, { ListBase lb_tmp = {NULL, NULL}; struct VertStep *vs, *vs_next; - BLI_assert(ABS(dir) == 1); + BLI_assert(abs(dir) == 1); for (vs = lb->first; vs; vs = vs_next) { BMIter iter; -- cgit v1.2.3