diff options
Diffstat (limited to 'source/blender/blenlib/BLI_utildefines.h')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index d027a3da2ef..f761f2edcba 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -114,7 +114,7 @@ /* some math and copy defines */ #ifndef SWAP -# define SWAP(type, a, b) { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; } +# define SWAP(type, a, b) { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; } (void)0 #endif #define ABS(a) ( (a) < 0 ? (-(a)) : (a) ) @@ -148,29 +148,29 @@ *(v1) = *(v2); \ *(v1 + 1) = *(v2 + 1); \ } (void)0 -#define VECADD(v1, v2, v3) { \ - *(v1) = *(v2) + *(v3); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2); \ +#define VECADD(v1, v2, v3) { \ + *(v1) = *(v2) + *(v3); \ + *(v1 + 1) = *(v2 + 1) + *(v3 + 1); \ + *(v1 + 2) = *(v2 + 2) + *(v3 + 2); \ } (void)0 -#define VECSUB(v1, v2, v3) { \ - *(v1) = *(v2) - *(v3); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ - *(v1 + 2) = *(v2 + 2) - *(v3 + 2); \ +#define VECSUB(v1, v2, v3) { \ + *(v1) = *(v2) - *(v3); \ + *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ + *(v1 + 2) = *(v2 + 2) - *(v3 + 2); \ } (void)0 -#define VECSUB2D(v1, v2, v3) { \ - *(v1) = *(v2) - *(v3); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ +#define VECSUB2D(v1, v2, v3) { \ + *(v1) = *(v2) - *(v3); \ + *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ } (void)0 -#define VECADDFAC(v1, v2, v3, fac) { \ - *(v1) = *(v2) + *(v3) * (fac); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac); \ +#define VECADDFAC(v1, v2, v3, fac) { \ + *(v1) = *(v2) + *(v3) * (fac); \ + *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac); \ + *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac); \ } (void)0 -#define VECSUBFAC(v1, v2, v3, fac) { \ - *(v1) = *(v2) - *(v3) * (fac); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac); \ - *(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac); \ +#define VECSUBFAC(v1, v2, v3, fac) { \ + *(v1) = *(v2) - *(v3) * (fac); \ + *(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac); \ + *(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac); \ } (void)0 #define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2]) @@ -223,7 +223,7 @@ #define SWITCH_SHORT(a) { \ char s_i, *p_i; \ p_i = (char *)&(a); \ - s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i; \ + s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i; \ } (void)0 |