From e182d43d3e695a5086e8167b1ed4fc04ef43dbec Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 28 Dec 2014 15:13:01 +1100 Subject: cleanup: avoid ref-counting None for a new matrix --- source/blender/python/mathutils/mathutils_Matrix.c | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'source') diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index b773d603e16..23e83050c88 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -1846,8 +1846,24 @@ static PyObject *Matrix_zero(MatrixObject *self) return NULL; Py_RETURN_NONE; + } /*---------------------------matrix.identity(() ------------------*/ +static void matrix_identity_internal(MatrixObject *self) +{ + BLI_assert((self->num_col == self->num_row) && (self->num_row <= 4)); + + if (self->num_col == 2) { + unit_m2((float (*)[2])self->matrix); + } + else if (self->num_col == 3) { + unit_m3((float (*)[3])self->matrix); + } + else { + unit_m4((float (*)[4])self->matrix); + } +} + PyDoc_STRVAR(Matrix_identity_doc, ".. method:: identity()\n" "\n" @@ -1870,15 +1886,7 @@ static PyObject *Matrix_identity(MatrixObject *self) return NULL; } - if (self->num_col == 2) { - unit_m2((float (*)[2])self->matrix); - } - else if (self->num_col == 3) { - unit_m3((float (*)[3])self->matrix); - } - else { - unit_m4((float (*)[4])self->matrix); - } + matrix_identity_internal(self); if (BaseMath_WriteCallback(self) == -1) return NULL; @@ -2808,8 +2816,7 @@ PyObject *Matrix_CreatePyObject(float *mat, } else if (num_col == num_row) { /* or if no arguments are passed return identity matrix for square matrices */ - PyObject *ret_dummy = Matrix_identity(self); - Py_DECREF(ret_dummy); + matrix_identity_internal(self); } else { /* otherwise zero everything */ -- cgit v1.2.3