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

Error in last commit

Browse Source
This commit is contained in:
Campbell Barton
2014-04-29 20:41:28 +10:00
parent 232f19f0c2
commit 94bf67b78e
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ typedef enum eMatrixAccess_t {
MAT_ACCESS_COL MAT_ACCESS_COL
} eMatrixAccess_t; } eMatrixAccess_t;
static PyObject *Matrix_copy_notest(MatrixObject *self, const float *matrix);
static PyObject *Matrix_copy(MatrixObject *self); static PyObject *Matrix_copy(MatrixObject *self);
static PyObject *Matrix_deepcopy(MatrixObject *self, PyObject *args); static PyObject *Matrix_deepcopy(MatrixObject *self, PyObject *args);
static int Matrix_ass_slice(MatrixObject *self, int begin, int end, PyObject *value); static int Matrix_ass_slice(MatrixObject *self, int begin, int end, PyObject *value);
@@ -893,7 +894,7 @@ static void matrix_copy(MatrixObject *mat_dst, const MatrixObject *mat_src)
} }
/* assumes rowsize == colsize is checked and the read callback has run */ /* assumes rowsize == colsize is checked and the read callback has run */
static float matrix_determinant_internal(MatrixObject *self) static float matrix_determinant_internal(const MatrixObject *self)
{ {
if (self->num_col == 2) { if (self->num_col == 2) {
return determinant_m2(MATRIX_ITEM(self, 0, 0), MATRIX_ITEM(self, 0, 1), return determinant_m2(MATRIX_ITEM(self, 0, 0), MATRIX_ITEM(self, 0, 1),
@@ -909,7 +910,9 @@ static float matrix_determinant_internal(MatrixObject *self)
} }
} }
static bool matrix_invert_internal(MatrixObject *self) /**
* \param r_mat can be from ``self->matrix`` or not. */
static bool matrix_invert_internal(const MatrixObject *self, float *r_mat)
{ {
float det; float det;
@@ -947,7 +950,7 @@ static bool matrix_invert_internal(MatrixObject *self)
z = 0; z = 0;
for (x = 0; x < self->num_col; x++) { for (x = 0; x < self->num_col; x++) {
for (y = 0; y < self->num_row; y++) { for (y = 0; y < self->num_row; y++) {
MATRIX_ITEM(self, y, x) = mat[z]; r_mat[MATRIX_ITEM_INDEX(self, y, x)] = mat[z];
z++; z++;
} }
} }
@@ -1306,7 +1309,7 @@ static PyObject *Matrix_invert(MatrixObject *self, PyObject *args)
return NULL; return NULL;
} }
if (matrix_invert_internal(self)) { if (matrix_invert_internal(self, self->matrix)) {
/* pass */ /* pass */
} }
else { else {
@@ -1316,8 +1319,10 @@ static PyObject *Matrix_invert(MatrixObject *self, PyObject *args)
if (BaseMath_ReadCallback(fallback) == -1) if (BaseMath_ReadCallback(fallback) == -1)
return NULL; return NULL;
if (self != fallback) {
matrix_copy(self, fallback); matrix_copy(self, fallback);
} }
}
else { else {
matrix_invert_raise_degenerate(); matrix_invert_raise_degenerate();
return NULL; return NULL;
@@ -1341,6 +1346,8 @@ PyDoc_STRVAR(Matrix_inverted_doc,
); );
static PyObject *Matrix_inverted(MatrixObject *self, PyObject *args) static PyObject *Matrix_inverted(MatrixObject *self, PyObject *args)
{ {
float mat[MATRIX_MAX_DIM * MATRIX_MAX_DIM];
if (BaseMath_ReadCallback(self) == -1) if (BaseMath_ReadCallback(self) == -1)
return NULL; return NULL;
@@ -1352,7 +1359,7 @@ static PyObject *Matrix_inverted(MatrixObject *self, PyObject *args)
return NULL; return NULL;
} }
if (matrix_invert_internal(self)) { if (matrix_invert_internal(self, mat)) {
/* pass */ /* pass */
} }
else { else {
@@ -1367,8 +1374,7 @@ static PyObject *Matrix_inverted(MatrixObject *self, PyObject *args)
} }
} }
(void)BaseMath_WriteCallback(self); return Matrix_copy_notest(self, mat);
Py_RETURN_NONE;
} }
static PyObject *Matrix_inverted_noargs(MatrixObject *self) static PyObject *Matrix_inverted_noargs(MatrixObject *self)
@@ -1380,7 +1386,7 @@ static PyObject *Matrix_inverted_noargs(MatrixObject *self)
return NULL; return NULL;
} }
if (matrix_invert_internal(self)) { if (matrix_invert_internal(self, self->matrix)) {
/* pass */ /* pass */
} }
else { else {
@@ -1768,6 +1774,12 @@ static PyObject *Matrix_identity(MatrixObject *self)
} }
/*---------------------------Matrix.copy() ------------------*/ /*---------------------------Matrix.copy() ------------------*/
static PyObject *Matrix_copy_notest(MatrixObject *self, const float *matrix)
{
return Matrix_CreatePyObject((float *)matrix, self->num_col, self->num_row, Py_NEW, Py_TYPE(self));
}
PyDoc_STRVAR(Matrix_copy_doc, PyDoc_STRVAR(Matrix_copy_doc,
".. method:: copy()\n" ".. method:: copy()\n"
"\n" "\n"
@@ -1781,7 +1793,7 @@ static PyObject *Matrix_copy(MatrixObject *self)
if (BaseMath_ReadCallback(self) == -1) if (BaseMath_ReadCallback(self) == -1)
return NULL; return NULL;
return Matrix_CreatePyObject((float (*))self->matrix, self->num_col, self->num_row, Py_NEW, Py_TYPE(self)); return Matrix_copy_notest(self, self->matrix);
} }
static PyObject *Matrix_deepcopy(MatrixObject *self, PyObject *args) static PyObject *Matrix_deepcopy(MatrixObject *self, PyObject *args)
{ {