archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

mathutils: replace interp w/ blend when standalone

Browse Source
This commit is contained in:
Campbell Barton
2018-03-18 05:01:30 +01:00
parent 07c90f3a73
commit 2aa0bde3dc
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/python/mathutils/mathutils_Matrix.c
View File

@@ -1710,10 +1710,18 @@ static PyObject *Matrix_lerp(MatrixObject *self, PyObject *args)
/* TODO, different sized matrix */ /* TODO, different sized matrix */
if (self->num_col == 4 && self->num_row == 4) { 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); 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) { 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); interp_m3_m3m3((float (*)[3])mat, (float (*)[3])self->matrix, (float (*)[3])mat2->matrix, fac);
#endif
} }
else { else {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,