kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

recent matrix row/col swap broke matrix assignment in the BGE, fix provided by Andrew Hale

Browse Source
This commit is contained in:
Campbell Barton 2011-12-23 00:51:54 +00:00
parent cb61a71ff6
commit 3cce96320e
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source/gameengine/Ketsji/KX_PyMath.h
View File

@ -65,32 +65,59 @@ bool PyMatTo(PyObject* pymat, T& mat)
{ {
bool noerror = true; bool noerror = true;
mat.setIdentity(); mat.setIdentity();
#ifdef USE_MATHUTILS
if (MatrixObject_Check(pymat))
{
MatrixObject *pymatrix = (MatrixObject *)pymat;
if (BaseMath_ReadCallback(pymatrix) == -1)
return false;
if (pymatrix->num_col != Size(mat) || pymatrix->num_row != Size(mat))
return false;
for (unsigned int row = 0; row < Size(mat); row++)
{
for (unsigned int col = 0; col < Size(mat); col++)
{
mat[row][col] = *(pymatrix->matrix + col * pymatrix->num_row + row);
}
}
}
else
#endif /* USE_MATHUTILS */
if (PySequence_Check(pymat)) if (PySequence_Check(pymat))
{ {
unsigned int cols = PySequence_Size(pymat); unsigned int rows = PySequence_Size(pymat);
if (cols != Size(mat)) if (rows != Size(mat))
return false; return false;
for (unsigned int x = 0; noerror && x < cols; x++) for (unsigned int row = 0; noerror && row < rows; row++)
{ {
PyObject *pycol = PySequence_GetItem(pymat, x); /* new ref */ PyObject *pyrow = PySequence_GetItem(pymat, row); /* new ref */
if (!PyErr_Occurred() && PySequence_Check(pycol)) if (!PyErr_Occurred() && PySequence_Check(pyrow))
{ {
unsigned int rows = PySequence_Size(pycol); unsigned int cols = PySequence_Size(pyrow);
if (rows != Size(mat)) if (cols != Size(mat))
noerror = false; noerror = false;
else else
{ {
for( unsigned int y = 0; y < rows; y++) for( unsigned int col = 0; col < cols; col++)
{ {
PyObject *item = PySequence_GetItem(pycol, y); /* new ref */ PyObject *item = PySequence_GetItem(pyrow, col); /* new ref */
mat[y][x] = PyFloat_AsDouble(item); mat[row][col] = PyFloat_AsDouble(item);
Py_DECREF(item); Py_DECREF(item);
} }
} }
} else } else
noerror = false; noerror = false;
Py_DECREF(pycol); Py_DECREF(pyrow);
} }
} else } else
noerror = false; noerror = false;