diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-22 11:26:49 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-22 11:26:49 +0300 |
commit | 128c7c3ba1d15e08241ec3e90fa694cfb210d2b9 (patch) | |
tree | b463c1b7df7de21673d4c5dca319390a3f1d1106 /source/blender/python | |
parent | 225e52eaf89039dccf66a4f503fdb7007b1a0394 (diff) | |
parent | f320d0e0a86207983ca4f7e7afb4fa7a140acf99 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/mathutils/mathutils_Vector.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index 5d46dc284f4..65450505e08 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -2401,7 +2401,6 @@ static int Vector_swizzle_set(VectorObject *self, PyObject *value, void *closure #define _SWIZZLE3(a, b, c) (_SWIZZLE2(a, b) | (((c) | SWIZZLE_VALID_AXIS) << (SWIZZLE_BITS_PER_AXIS * 2))) #define _SWIZZLE4(a, b, c, d) (_SWIZZLE3(a, b, c) | (((d) | SWIZZLE_VALID_AXIS) << (SWIZZLE_BITS_PER_AXIS * 3))) -#define SWIZZLE1(a) SET_INT_IN_POINTER(_SWIZZLE1(a)) #define SWIZZLE2(a, b) SET_INT_IN_POINTER(_SWIZZLE2(a, b)) #define SWIZZLE3(a, b, c) SET_INT_IN_POINTER(_SWIZZLE3(a, b, c)) #define SWIZZLE4(a, b, c, d) SET_INT_IN_POINTER(_SWIZZLE4(a, b, c, d)) |