diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 16:40:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 16:40:15 +0400 |
commit | 0d63bb005ff7c45ca0ebcfbe4eaf1215dfe2d3e2 (patch) | |
tree | 39e55a1385696d10833080d7482ada1e031f9bd9 /source/blender/python | |
parent | 565fcd8907c4cbd105bef9330e13ccbd893a6f3e (diff) |
replace VECCOPY and QUATCOPY with inline funcs.
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/mathutils/mathutils_Quaternion.c | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils_geometry.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c index 554d4ba132d..7eb39509e6b 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.c +++ b/source/blender/python/mathutils/mathutils_Quaternion.c @@ -1157,7 +1157,7 @@ PyObject *newQuaternionObject(float *quat, int type, PyTypeObject *base_type) unit_qt(self->quat); } else { - QUATCOPY(self->quat, quat); + copy_qt_qt(self->quat, quat); } self->wrapped = Py_NEW; } diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index 44bb2ed51aa..6e8624721b7 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -628,14 +628,14 @@ static PyObject *M_Geometry_intersect_point_line(PyObject *UNUSED(self), PyObjec return NULL; /* accept 2d verts */ - if (pt->size==3) { VECCOPY(pt_in, pt->vec);} - else { pt_in[2]=0.0; VECCOPY2D(pt_in, pt->vec) } + if (pt->size==3) { copy_v3_v3(pt_in, pt->vec);} + else { pt_in[2]=0.0; copy_v2_v2(pt_in, pt->vec); } - if (line_1->size==3) { VECCOPY(l1, line_1->vec);} - else { l1[2]=0.0; VECCOPY2D(l1, line_1->vec) } + if (line_1->size==3) { copy_v3_v3(l1, line_1->vec);} + else { l1[2]=0.0; copy_v2_v2(l1, line_1->vec); } - if (line_2->size==3) { VECCOPY(l2, line_2->vec);} - else { l2[2]=0.0; VECCOPY2D(l2, line_2->vec) } + if (line_2->size==3) { copy_v3_v3(l2, line_2->vec);} + else { l2[2]=0.0; copy_v2_v2(l2, line_2->vec); } /* do the calculation */ lambda= closest_to_line_v3(pt_out, pt_in, l1, l2); |