mathutils: replace interp w/ blend when standalone
authorCampbell Barton <ideasman42@gmail.com>
Sun, 18 Mar 2018 04:01:30 +0000 (05:01 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 18 Mar 2018 04:08:12 +0000 (05:08 +0100)
source/blender/python/mathutils/mathutils_Matrix.c

index 924e46a..cc6a536 100644 (file)
@@ -1710,10 +1710,18 @@ static PyObject *Matrix_lerp(MatrixObject *self, PyObject *args)
 
        /* TODO, different sized matrix */
        if (self->num_col == 4 && self->num_row == 4) {
+#ifdef MATH_STANDALONE
+               blend_m4_m4m4((float (*)[4])mat, (float (*)[4])self->matrix, (float (*)[4])mat2->matrix, fac);
+#else
                interp_m4_m4m4((float (*)[4])mat, (float (*)[4])self->matrix, (float (*)[4])mat2->matrix, fac);
+#endif
        }
        else if (self->num_col == 3 && self->num_row == 3) {
+#ifdef MATH_STANDALONE
+               blend_m3_m3m3((float (*)[3])mat, (float (*)[3])self->matrix, (float (*)[3])mat2->matrix, fac);
+#else
                interp_m3_m3m3((float (*)[3])mat, (float (*)[3])self->matrix, (float (*)[3])mat2->matrix, fac);
+#endif
        }
        else {
                PyErr_SetString(PyExc_ValueError,