From 6aa75d3b2c3d4a5dc58120a51fdee0a7c12ab93c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 31 Mar 2014 11:17:46 +1100 Subject: Fix for error in normalize_vn_vn(), add len_squared_vn --- source/blender/python/mathutils/mathutils_Vector.c | 27 +++++++--------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'source/blender/python') diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index 3dc953e22e9..96e68317e2d 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -1888,17 +1888,6 @@ static PyObject *Vector_neg(VectorObject *self) return Vector_CreatePyObject_alloc(tvec, self->size, Py_TYPE(self)); } -/*------------------------vec_magnitude_nosqrt (internal) - for comparing only */ -static double vec_magnitude_nosqrt(const float *data, int size) -{ - /* return (double)sqrt(dot);*/ - /* warning, line above removed because we are not using the length, - * rather the comparing the sizes and for this we do not need the sqrt - * for the actual length, the dot must be sqrt'd */ - return dot_vn_vn(data, data, size); -} - - /*------------------------tp_richcmpr * returns -1 exception, 0 false, 1 true */ static PyObject *Vector_richcmpr(PyObject *objectA, PyObject *objectB, int comparison_type) @@ -1933,15 +1922,15 @@ static PyObject *Vector_richcmpr(PyObject *objectA, PyObject *objectB, int compa switch (comparison_type) { case Py_LT: - lenA = vec_magnitude_nosqrt(vecA->vec, vecA->size); - lenB = vec_magnitude_nosqrt(vecB->vec, vecB->size); + lenA = len_squared_vn(vecA->vec, vecA->size); + lenB = len_squared_vn(vecB->vec, vecB->size); if (lenA < lenB) { result = 1; } break; case Py_LE: - lenA = vec_magnitude_nosqrt(vecA->vec, vecA->size); - lenB = vec_magnitude_nosqrt(vecB->vec, vecB->size); + lenA = len_squared_vn(vecA->vec, vecA->size); + lenB = len_squared_vn(vecB->vec, vecB->size); if (lenA < lenB) { result = 1; } @@ -1956,15 +1945,15 @@ static PyObject *Vector_richcmpr(PyObject *objectA, PyObject *objectB, int compa result = !EXPP_VectorsAreEqual(vecA->vec, vecB->vec, vecA->size, 1); break; case Py_GT: - lenA = vec_magnitude_nosqrt(vecA->vec, vecA->size); - lenB = vec_magnitude_nosqrt(vecB->vec, vecB->size); + lenA = len_squared_vn(vecA->vec, vecA->size); + lenB = len_squared_vn(vecB->vec, vecB->size); if (lenA > lenB) { result = 1; } break; case Py_GE: - lenA = vec_magnitude_nosqrt(vecA->vec, vecA->size); - lenB = vec_magnitude_nosqrt(vecB->vec, vecB->size); + lenA = len_squared_vn(vecA->vec, vecA->size); + lenB = len_squared_vn(vecB->vec, vecB->size); if (lenA > lenB) { result = 1; } -- cgit v1.2.3