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

fix for error with matrix access and negative indices with recent row/col swap.

Browse Source
This commit is contained in:
Campbell Barton
2011-12-24 06:13:58 +00:00
parent b42497b460
commit 28a5549ecf
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/mathutils/mathutils.c
View File

@@ -455,8 +455,8 @@ PyMODINIT_FUNC PyInit_mathutils(void)
PyDict_SetItemString(sys_modules, "mathutils.noise", item); PyDict_SetItemString(sys_modules, "mathutils.noise", item);
Py_INCREF(item); Py_INCREF(item);
mathutils_matrix_vector_cb_index= Mathutils_RegisterCallback(&mathutils_matrix_vector_cb); mathutils_matrix_row_cb_index= Mathutils_RegisterCallback(&mathutils_matrix_row_cb);
mathutils_matrix_column_cb_index= Mathutils_RegisterCallback(&mathutils_matrix_column_cb); mathutils_matrix_col_cb_index= Mathutils_RegisterCallback(&mathutils_matrix_col_cb);
return submodule; return submodule;
} }

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

@@ -43,7 +43,7 @@ static int Matrix_ass_slice(MatrixObject *self, int begin, int end, PyObject *va
static PyObject *matrix__apply_to_copy(PyNoArgsFunction matrix_func, MatrixObject *self); static PyObject *matrix__apply_to_copy(PyNoArgsFunction matrix_func, MatrixObject *self);
/* matrix row callbacks */ /* matrix row callbacks */
int mathutils_matrix_vector_cb_index= -1; int mathutils_matrix_row_cb_index= -1;
static int mathutils_matrix_vector_check(BaseMathObject *bmo) static int mathutils_matrix_vector_check(BaseMathObject *bmo)
{ {
@@ -106,7 +106,7 @@ static int mathutils_matrix_vector_set_index(BaseMathObject *bmo, int row, int c
return 0; return 0;
} }
Mathutils_Callback mathutils_matrix_vector_cb = { Mathutils_Callback mathutils_matrix_row_cb = {
mathutils_matrix_vector_check, mathutils_matrix_vector_check,
mathutils_matrix_vector_get, mathutils_matrix_vector_get,
mathutils_matrix_vector_set, mathutils_matrix_vector_set,
@@ -116,7 +116,7 @@ Mathutils_Callback mathutils_matrix_vector_cb = {
/* matrix vector callbacks, this is so you can do matrix[i][j] = val */ /* matrix vector callbacks, this is so you can do matrix[i][j] = val */
/* matrix row callbacks */ /* matrix row callbacks */
int mathutils_matrix_column_cb_index= -1; int mathutils_matrix_col_cb_index= -1;
static int mathutils_matrix_column_check(BaseMathObject *bmo) static int mathutils_matrix_column_check(BaseMathObject *bmo)
{ {
@@ -187,7 +187,7 @@ static int mathutils_matrix_column_set_index(BaseMathObject *bmo, int col, int r
return 0; return 0;
} }
Mathutils_Callback mathutils_matrix_column_cb = { Mathutils_Callback mathutils_matrix_col_cb = {
mathutils_matrix_column_check, mathutils_matrix_column_check,
mathutils_matrix_column_get, mathutils_matrix_column_get,
mathutils_matrix_column_set, mathutils_matrix_column_set,
@@ -1483,7 +1483,7 @@ static PyObject *Matrix_item(MatrixObject *self, int row)
"array index out of range"); "array index out of range");
return NULL; return NULL;
} }
return Vector_CreatePyObject_cb((PyObject *)self, self->num_col, mathutils_matrix_vector_cb_index, row); return Vector_CreatePyObject_cb((PyObject *)self, self->num_col, mathutils_matrix_row_cb_index, row);
} }
/*----------------------------object[]------------------------- /*----------------------------object[]-------------------------
sequence accessor (set) */ sequence accessor (set) */
@@ -1532,7 +1532,7 @@ static PyObject *Matrix_slice(MatrixObject *self, int begin, int end)
tuple= PyTuple_New(end - begin); tuple= PyTuple_New(end - begin);
for (count= begin; count < end; count++) { for (count= begin; count < end; count++) {
PyTuple_SET_ITEM(tuple, count - begin, PyTuple_SET_ITEM(tuple, count - begin,
Vector_CreatePyObject_cb((PyObject *)self, self->num_col, mathutils_matrix_vector_cb_index, count)); Vector_CreatePyObject_cb((PyObject *)self, self->num_col, mathutils_matrix_row_cb_index, count));
} }
@@ -1786,13 +1786,13 @@ static PyObject *Matrix_subscript(MatrixObject* self, PyObject* item)
if (i == -1 && PyErr_Occurred()) if (i == -1 && PyErr_Occurred())
return NULL; return NULL;
if (i < 0) if (i < 0)
i += self->num_col; i += self->num_row;
return Matrix_item(self, i); return Matrix_item(self, i);
} }
else if (PySlice_Check(item)) { else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelength; Py_ssize_t start, stop, step, slicelength;
if (PySlice_GetIndicesEx((void *)item, self->num_col, &start, &stop, &step, &slicelength) < 0) if (PySlice_GetIndicesEx((void *)item, self->num_row, &start, &stop, &step, &slicelength) < 0)
return NULL; return NULL;
if (slicelength <= 0) { if (slicelength <= 0) {
@@ -1822,13 +1822,13 @@ static int Matrix_ass_subscript(MatrixObject* self, PyObject* item, PyObject* va
if (i == -1 && PyErr_Occurred()) if (i == -1 && PyErr_Occurred())
return -1; return -1;
if (i < 0) if (i < 0)
i += self->num_col; i += self->num_row;
return Matrix_ass_item(self, i, value); return Matrix_ass_item(self, i, value);
} }
else if (PySlice_Check(item)) { else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelength; Py_ssize_t start, stop, step, slicelength;
if (PySlice_GetIndicesEx((void *)item, self->num_col, &start, &stop, &step, &slicelength) < 0) if (PySlice_GetIndicesEx((void *)item, self->num_row, &start, &stop, &step, &slicelength) < 0)
return -1; return -1;
if (step == 1) if (step == 1)
@@ -1916,7 +1916,7 @@ static PyObject *Matrix_translation_get(MatrixObject *self, void *UNUSED(closure
return NULL; return NULL;
} }
ret = (PyObject *)Vector_CreatePyObject_cb((PyObject *)self, 3, mathutils_matrix_column_cb_index, 3); ret = (PyObject *)Vector_CreatePyObject_cb((PyObject *)self, 3, mathutils_matrix_col_cb_index, 3);
return ret; return ret;
} }

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

@@ -72,10 +72,10 @@ PyObject *Matrix_CreatePyObject_cb(PyObject *user,
const unsigned short num_col, const unsigned short num_row, const unsigned short num_col, const unsigned short num_row,
int cb_type, int cb_subtype); int cb_type, int cb_subtype);
extern int mathutils_matrix_vector_cb_index; extern int mathutils_matrix_row_cb_index; /* default */
extern int mathutils_matrix_column_cb_index; extern int mathutils_matrix_col_cb_index;
extern struct Mathutils_Callback mathutils_matrix_vector_cb; extern struct Mathutils_Callback mathutils_matrix_row_cb; /* default */
extern struct Mathutils_Callback mathutils_matrix_column_cb; extern struct Mathutils_Callback mathutils_matrix_col_cb;
void matrix_as_3x3(float mat[3][3], MatrixObject *self); void matrix_as_3x3(float mat[3][3], MatrixObject *self);