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

include invalid type name in mathutils error messages.

Browse Source
This commit is contained in:
Campbell Barton
2011-11-13 09:20:04 +00:00
parent 880225db77
commit 72a7101576
4 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/blender/python/mathutils/mathutils_Color.c
View File

@@ -370,9 +370,10 @@ static PyObject *Color_add(PyObject *v1, PyObject *v2)
float col[COLOR_SIZE]; float col[COLOR_SIZE];
if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) { if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Color addition: " "Color addition: (%s + %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
color1 = (ColorObject*)v1; color1 = (ColorObject*)v1;
@@ -392,9 +393,10 @@ static PyObject *Color_iadd(PyObject *v1, PyObject *v2)
ColorObject *color1 = NULL, *color2 = NULL; ColorObject *color1 = NULL, *color2 = NULL;
if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) { if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Color addition: " "Color addition: (%s += %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
color1 = (ColorObject*)v1; color1 = (ColorObject*)v1;
@@ -417,9 +419,10 @@ static PyObject *Color_sub(PyObject *v1, PyObject *v2)
float col[COLOR_SIZE]; float col[COLOR_SIZE];
if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) { if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Color subtraction: " "Color subtraction: (%s - %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
color1 = (ColorObject*)v1; color1 = (ColorObject*)v1;
@@ -439,9 +442,10 @@ static PyObject *Color_isub(PyObject *v1, PyObject *v2)
ColorObject *color1= NULL, *color2= NULL; ColorObject *color1= NULL, *color2= NULL;
if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) { if (!ColorObject_Check(v1) || !ColorObject_Check(v2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Color subtraction: " "Color subtraction: (%s -= %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
color1 = (ColorObject*)v1; color1 = (ColorObject*)v1;
@@ -554,9 +558,10 @@ static PyObject *Color_imul(PyObject *v1, PyObject *v2)
mul_vn_fl(color->col, COLOR_SIZE, scalar); mul_vn_fl(color->col, COLOR_SIZE, scalar);
} }
else { else {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Color multiplication: " "Color multiplication: (%s *= %s) "
"arguments not acceptable for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
@@ -585,9 +590,10 @@ static PyObject *Color_idiv(PyObject *v1, PyObject *v2)
mul_vn_fl(color->col, COLOR_SIZE, 1.0f / scalar); mul_vn_fl(color->col, COLOR_SIZE, 1.0f / scalar);
} }
else { else {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Color multiplication: " "Color division: (%s /= %s) "
"arguments not acceptable for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }

15
source/blender/python/mathutils/mathutils_Matrix.c
View File

@@ -1489,9 +1489,10 @@ static PyObject *Matrix_add(PyObject *m1, PyObject *m2)
mat2 = (MatrixObject*)m2; mat2 = (MatrixObject*)m2;
if (!MatrixObject_Check(m1) || !MatrixObject_Check(m2)) { if (!MatrixObject_Check(m1) || !MatrixObject_Check(m2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Matrix addition: " "Matrix addition: (%s + %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(m1)->tp_name, Py_TYPE(m2)->tp_name);
return NULL; return NULL;
} }
@@ -1520,9 +1521,11 @@ static PyObject *Matrix_sub(PyObject *m1, PyObject *m2)
mat2 = (MatrixObject*)m2; mat2 = (MatrixObject*)m2;
if (!MatrixObject_Check(m1) || !MatrixObject_Check(m2)) { if (!MatrixObject_Check(m1) || !MatrixObject_Check(m2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Matrix addition: " "Matrix subtraction: (%s - %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(m1)->tp_name, Py_TYPE(m2)->tp_name
);
return NULL; return NULL;
} }

14
source/blender/python/mathutils/mathutils_Quaternion.c
View File

@@ -707,9 +707,10 @@ static PyObject *Quaternion_add(PyObject *q1, PyObject *q2)
QuaternionObject *quat1 = NULL, *quat2 = NULL; QuaternionObject *quat1 = NULL, *quat2 = NULL;
if (!QuaternionObject_Check(q1) || !QuaternionObject_Check(q2)) { if (!QuaternionObject_Check(q1) || !QuaternionObject_Check(q2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Quaternion addition: " "Quaternion addition: (%s + %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(q1)->tp_name, Py_TYPE(q2)->tp_name);
return NULL; return NULL;
} }
quat1 = (QuaternionObject*)q1; quat1 = (QuaternionObject*)q1;
@@ -730,9 +731,10 @@ static PyObject *Quaternion_sub(PyObject *q1, PyObject *q2)
QuaternionObject *quat1 = NULL, *quat2 = NULL; QuaternionObject *quat1 = NULL, *quat2 = NULL;
if (!QuaternionObject_Check(q1) || !QuaternionObject_Check(q2)) { if (!QuaternionObject_Check(q1) || !QuaternionObject_Check(q2)) {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Quaternion addition: " "Quaternion subtraction: (%s - %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(q1)->tp_name, Py_TYPE(q2)->tp_name);
return NULL; return NULL;
} }

35
source/blender/python/mathutils/mathutils_Vector.c
View File

@@ -953,9 +953,10 @@ static PyObject *Vector_add(PyObject *v1, PyObject *v2)
float vec[MAX_DIMENSIONS]; float vec[MAX_DIMENSIONS];
if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) { if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) {
PyErr_SetString(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"Vector addition: " "Vector addition: (%s + %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
vec1 = (VectorObject*)v1; vec1 = (VectorObject*)v1;
@@ -983,9 +984,10 @@ static PyObject *Vector_iadd(PyObject *v1, PyObject *v2)
VectorObject *vec1 = NULL, *vec2 = NULL; VectorObject *vec1 = NULL, *vec2 = NULL;
if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) { if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) {
PyErr_SetString(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"Vector addition: " "Vector addition: (%s += %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
vec1 = (VectorObject*)v1; vec1 = (VectorObject*)v1;
@@ -1015,9 +1017,10 @@ static PyObject *Vector_sub(PyObject *v1, PyObject *v2)
float vec[MAX_DIMENSIONS]; float vec[MAX_DIMENSIONS];
if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) { if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) {
PyErr_SetString(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"Vector subtraction: " "Vector subtraction: (%s - %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
vec1 = (VectorObject*)v1; vec1 = (VectorObject*)v1;
@@ -1044,9 +1047,10 @@ static PyObject *Vector_isub(PyObject *v1, PyObject *v2)
VectorObject *vec1= NULL, *vec2= NULL; VectorObject *vec1= NULL, *vec2= NULL;
if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) { if (!VectorObject_Check(v1) || !VectorObject_Check(v2)) {
PyErr_SetString(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"Vector subtraction: " "Vector subtraction: (%s -= %s) "
"arguments not valid for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }
vec1 = (VectorObject*)v1; vec1 = (VectorObject*)v1;
@@ -1281,9 +1285,10 @@ static PyObject *Vector_imul(PyObject *v1, PyObject *v2)
mul_vn_fl(vec->vec, vec->size, scalar); mul_vn_fl(vec->vec, vec->size, scalar);
} }
else { else {
PyErr_SetString(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"Vector multiplication: " "Vector multiplication: (%s *= %s) "
"arguments not acceptable for this operation"); "invalid type for this operation",
Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
return NULL; return NULL;
} }