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

svn merge ^/trunk/blender -r40720:40872

Browse Source
This commit is contained in:
Campbell Barton
2011-10-09 07:31:15 +00:00
parent 9d0186fc6a 8714fb7019
commit aa6d7ebd14
212 changed files with 2400 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,11 +94,11 @@ int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *
#if 1 /* approx 6x speedup for mathutils types */
int size;
if( (VectorObject_Check(value) && (size= ((VectorObject *)value)->size)) ||
(EulerObject_Check(value) && (size= 3)) ||
(QuaternionObject_Check(value) && (size= 4)) ||
(ColorObject_Check(value) && (size= 3))
) {
if( (size= VectorObject_Check(value) ? ((VectorObject *)value)->size : 0) ||
(size= EulerObject_Check(value) ? 3 : 0) ||
(size= QuaternionObject_Check(value) ? 4 : 0) ||
(size= ColorObject_Check(value) ? 3 : 0))
{
if(BaseMath_ReadCallback((BaseMathObject *)value) == -1) {
return -1;
}