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

svn merge -r40295:40367 ^/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton
2011-09-21 17:15:54 +00:00
parent b602024a26 d78231734d
commit 14475d07cd
191 changed files with 3268 additions and 1946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/python/mathutils/mathutils_Euler.c
View File

@@ -196,16 +196,18 @@ PyDoc_STRVAR(Euler_rotate_axis_doc,
static PyObject *Euler_rotate_axis(EulerObject * self, PyObject *args)
{
float angle = 0.0f;
const char *axis;
int axis; /* actually a character */
if(!PyArg_ParseTuple(args, "sf:rotate", &axis, &angle)){
if(!PyArg_ParseTuple(args, "Cf:rotate", &axis, &angle)){
PyErr_SetString(PyExc_TypeError,
"euler.rotate(): "
"expected angle (float) and axis (x, y, z)");
"Euler.rotate_axis(): "
"expected an axis 'X', 'Y', 'Z' and an angle (float)");
return NULL;
}
if(!(ELEM3(*axis, 'X', 'Y', 'Z') && axis[1]=='\0')){
PyErr_SetString(PyExc_ValueError, "euler.rotate(): "
if(!(ELEM3(axis, 'X', 'Y', 'Z'))){
PyErr_SetString(PyExc_ValueError,
"Euler.rotate_axis(): "
"expected axis to be 'X', 'Y' or 'Z'");
return NULL;
}
@@ -214,7 +216,7 @@ static PyObject *Euler_rotate_axis(EulerObject * self, PyObject *args)
return NULL;
rotate_eulO(self->eul, self->order, *axis, angle);
rotate_eulO(self->eul, self->order, (char)axis, angle);
(void)BaseMath_WriteCallback(self);