merge from trunk at r31523

2010-09-07 05:47:34 +00:00
parent 859c5a42f0 8a320974f1
commit 82432d0d99
342 changed files with 6150 additions and 4824 deletions
--- a/source/blender/python/generic/mathutils_euler.c
+++ b/source/blender/python/generic/mathutils_euler.c
@@ -250,7 +250,7 @@ static PyObject *Euler_Rotate(EulerObject * self, PyObject *args)
 		PyErr_SetString(PyExc_TypeError, "euler.rotate(): expected angle (float) and axis (x,y,z)");
 		return NULL;
 	}
-	if(ELEM3(*axis, 'X', 'Y', 'Z') && axis[1]=='\0'){
+	if(!(ELEM3(*axis, 'X', 'Y', 'Z') && axis[1]=='\0')){
 		PyErr_SetString(PyExc_TypeError, "euler.rotate(): expected axis to be 'X', 'Y' or 'Z'");
 		return NULL;
 	}