From 482c4d099ae88bea018712b92b2990617ef006f8 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sun, 20 Jan 2019 16:22:55 +0100 Subject: Cleanup: remove all BLI_utiledefines' ugly vectorial macros. Not only were those often making doublons with already existing BLI_math's stuff, but they were also used to hide implicit type conversions... As usual this adds some more exotic inlined vector functions (one of the rare cases where I really miss C++ and its templates... ;) ). --- source/blender/physics/intern/implicit_blender.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/physics/intern/implicit_blender.c') diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index 28546f8ca0d..61b6d0670f4 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -216,7 +216,7 @@ DO_INLINE void add_lfvector_lfvector(float(*to)[3], float(*fLongVectorA)[3], flo unsigned int i = 0; for (i = 0; i < verts; i++) { - VECADD(to[i], fLongVectorA[i], fLongVectorB[i]); + add_v3_v3v3(to[i], fLongVectorA[i], fLongVectorB[i]); } } @@ -431,9 +431,9 @@ DO_INLINE void mul_fmatrix_fvector(float *to, float matrix[3][3], float from[3]) /* 3x3 matrix addition with 3x3 matrix */ DO_INLINE void add_fmatrix_fmatrix(float to[3][3], float matrixA[3][3], float matrixB[3][3]) { - VECADD(to[0], matrixA[0], matrixB[0]); - VECADD(to[1], matrixA[1], matrixB[1]); - VECADD(to[2], matrixA[2], matrixB[2]); + add_v3_v3v3(to[0], matrixA[0], matrixB[0]); + add_v3_v3v3(to[1], matrixA[1], matrixB[1]); + add_v3_v3v3(to[2], matrixA[2], matrixB[2]); } /* A -= B*x + C*y (3x3 matrix sub-addition with 3x3 matrix) */ DO_INLINE void subadd_fmatrixS_fmatrixS(float to[3][3], float matrixA[3][3], float aS, float matrixB[3][3], float bS) -- cgit v1.2.3