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/editors/space_node/drawnode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_node/drawnode.c') diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 148c1669b06..beaa8c2617e 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -651,7 +651,7 @@ static void node_draw_reroute(const bContext *C, static int node_tweak_area_reroute(bNode *node, int x, int y) { /* square of tweak radius */ - const float tweak_radius_sq = SQUARE(24); + const float tweak_radius_sq = square_f(24.0f); bNodeSocket *sock = node->inputs.first; float dx = sock->locx - x; @@ -3656,7 +3656,7 @@ static bool node_link_bezier_handles(View2D *v2d, deltay = vec[3][1] - vec[0][1]; /* check direction later, for top sockets */ if (fromreroute) { - if (ABS(deltax) > ABS(deltay)) { + if (fabsf(deltax) > fabsf(deltay)) { vec[1][1] = vec[0][1]; vec[1][0] = vec[0][0] + (deltax > 0 ? dist : -dist); } @@ -3670,7 +3670,7 @@ static bool node_link_bezier_handles(View2D *v2d, vec[1][1] = vec[0][1]; } if (toreroute) { - if (ABS(deltax) > ABS(deltay)) { + if (fabsf(deltax) > fabsf(deltay)) { vec[2][1] = vec[3][1]; vec[2][0] = vec[3][0] + (deltax > 0 ? -dist : dist); } -- cgit v1.2.3