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

crash fix from own recent updates to Mathutils.RotationMatrix()

Browse Source
This commit is contained in:
Campbell Barton
2010-01-27 12:53:25 +00:00
parent a22eb04b19
commit f8200f14ae
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/python/generic/Mathutils.c
View File

@@ -207,7 +207,11 @@ static PyObject *M_Mathutils_RotationMatrix(PyObject * self, PyObject * args)
angle = angle * (float) (Py_PI / 180);
#endif
if(axis == NULL && matSize == 2) {
/* check for valid vector/axis above */
if(vec) {
axis_angle_to_mat3( (float (*)[3])mat,vec->vec, angle);
}
else if(matSize == 2) {
//2D rotation matrix
mat[0] = (float) cos (angle);
mat[1] = (float) sin (angle);
@@ -234,9 +238,11 @@ static PyObject *M_Mathutils_RotationMatrix(PyObject * self, PyObject * args)
mat[3] = -((float) sin(angle));
mat[4] = (float) cos(angle);
mat[8] = 1.0f;
} else {
/* check for valid vector/axis above */
axis_angle_to_mat3( (float (*)[3])mat,vec->vec, angle);
}
else {
/* should never get here */
PyErr_SetString(PyExc_AttributeError, "Mathutils.RotationMatrix(): unknown error\n");
return NULL;
}
if(matSize == 4) {