[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34632] trunk/blender/source/blender/ python/generic: small mathutils changes.
Campbell Barton
ideasman42 at gmail.com
Fri Feb 4 04:39:08 CET 2011
Revision: 34632
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34632
Author: campbellbarton
Date: 2011-02-04 03:39:06 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
small mathutils changes.
- fix for returning empty slices (was returning list rather then tuple).
- report invalid type when mathutils_array_parse_fast() fails.
Modified Paths:
--------------
trunk/blender/source/blender/python/generic/mathutils.c
trunk/blender/source/blender/python/generic/mathutils_color.c
trunk/blender/source/blender/python/generic/mathutils_euler.c
trunk/blender/source/blender/python/generic/mathutils_matrix.c
trunk/blender/source/blender/python/generic/mathutils_quat.c
trunk/blender/source/blender/python/generic/mathutils_vector.c
Modified: trunk/blender/source/blender/python/generic/mathutils.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils.c 2011-02-04 03:06:23 UTC (rev 34631)
+++ trunk/blender/source/blender/python/generic/mathutils.c 2011-02-04 03:39:06 UTC (rev 34632)
@@ -85,6 +85,7 @@
static int mathutils_array_parse_fast(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix)
{
PyObject *value_fast= NULL;
+ PyObject *item;
int i, size;
@@ -106,8 +107,8 @@
i= size;
do {
i--;
- if(((array[i]= PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value_fast, i))) == -1.0) && PyErr_Occurred()) {
- PyErr_Format(PyExc_ValueError, "%.200s: sequence index %d is not a float", error_prefix, i);
+ if(((array[i]= PyFloat_AsDouble((item= PySequence_Fast_GET_ITEM(value_fast, i)))) == -1.0) && PyErr_Occurred()) {
+ PyErr_Format(PyExc_ValueError, "%.200s: sequence index %d expected a number, found '%.200s' type, ", error_prefix, i, Py_TYPE(item)->tp_name);
Py_DECREF(value_fast);
return -1;
}
Modified: trunk/blender/source/blender/python/generic/mathutils_color.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_color.c 2011-02-04 03:06:23 UTC (rev 34631)
+++ trunk/blender/source/blender/python/generic/mathutils_color.c 2011-02-04 03:39:06 UTC (rev 34632)
@@ -280,7 +280,7 @@
return NULL;
if (slicelength <= 0) {
- return PyList_New(0);
+ return PyTuple_New(0);
}
else if (step == 1) {
return Color_slice(self, start, stop);
Modified: trunk/blender/source/blender/python/generic/mathutils_euler.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_euler.c 2011-02-04 03:06:23 UTC (rev 34631)
+++ trunk/blender/source/blender/python/generic/mathutils_euler.c 2011-02-04 03:39:06 UTC (rev 34632)
@@ -446,7 +446,7 @@
return NULL;
if (slicelength <= 0) {
- return PyList_New(0);
+ return PyTuple_New(0);
}
else if (step == 1) {
return Euler_slice(self, start, stop);
Modified: trunk/blender/source/blender/python/generic/mathutils_matrix.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_matrix.c 2011-02-04 03:06:23 UTC (rev 34631)
+++ trunk/blender/source/blender/python/generic/mathutils_matrix.c 2011-02-04 03:39:06 UTC (rev 34632)
@@ -1553,7 +1553,7 @@
return NULL;
if (slicelength <= 0) {
- return PyList_New(0);
+ return PyTuple_New(0);
}
else if (step == 1) {
return Matrix_slice(self, start, stop);
Modified: trunk/blender/source/blender/python/generic/mathutils_quat.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_quat.c 2011-02-04 03:06:23 UTC (rev 34631)
+++ trunk/blender/source/blender/python/generic/mathutils_quat.c 2011-02-04 03:39:06 UTC (rev 34632)
@@ -548,7 +548,7 @@
return NULL;
if (slicelength <= 0) {
- return PyList_New(0);
+ return PyTuple_New(0);
}
else if (step == 1) {
return Quaternion_slice(self, start, stop);
Modified: trunk/blender/source/blender/python/generic/mathutils_vector.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_vector.c 2011-02-04 03:06:23 UTC (rev 34631)
+++ trunk/blender/source/blender/python/generic/mathutils_vector.c 2011-02-04 03:39:06 UTC (rev 34632)
@@ -1324,7 +1324,7 @@
return NULL;
if (slicelength <= 0) {
- return PyList_New(0);
+ return PyTuple_New(0);
}
else if (step == 1) {
return Vector_slice(self, start, stop);
More information about the Bf-blender-cvs
mailing list