diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-18 18:05:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-18 18:05:02 +0300 |
| commit | e95282e783f2cebb700c354ad181dd5efce50d04 (patch) | |
| tree | c775ea102783f363b90469f2cf5ba2bad1da4f79 /source/blender/python | |
| parent | 4a3d94c0734d1475aa9a2fbe89039fbc59c9fb8d (diff) | |
| parent | 0301df40e5b6c51575d7f9013a1a28b901063829 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/mathutils/mathutils_Matrix.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 924e46a8c00..cc6a5367895 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -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, |