diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 18:27:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 18:27:36 +0400 |
commit | b81bfd86b445789507b61b22abcad8a2ad150d2e (patch) | |
tree | f5fb24e0a45ed4e39fd2c0d9b5828dde15b3c6d3 /source | |
parent | 5e1f6f01740714fd51df4b4d249b0590261ebd8c (diff) |
use ValueError when vector/matrix multiplications sizes are not supported, was using TypeError for mat*vec and ValueError for vec*mat.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/python/mathutils/mathutils_Vector.c | 2 | ||||
-rw-r--r-- | source/tests/bl_pyapi_mathutils.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index dec701d5fc3..765df7afcf9 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -1497,7 +1497,7 @@ int column_vector_multiplication(float r_vec[MAX_DIMENSIONS], VectorObject *vec, vec_cpy[3] = 1.0f; } else { - PyErr_SetString(PyExc_TypeError, + PyErr_SetString(PyExc_ValueError, "matrix * vector: " "len(matrix.col) and len(vector) must be the same, " "except for 4x4 matrix * 3D vector."); diff --git a/source/tests/bl_pyapi_mathutils.py b/source/tests/bl_pyapi_mathutils.py index b2e9f27d9ec..a37f74463ee 100644 --- a/source/tests/bl_pyapi_mathutils.py +++ b/source/tests/bl_pyapi_mathutils.py @@ -111,8 +111,8 @@ class MatrixTesting(unittest.TestCase): vec = Vector((1, 2)) - self.assertRaises(TypeError, mat1.__mul__, vec) - self.assertRaises(ValueError, vec.__mul__, mat1) # Why are these different?! + self.assertRaises(ValueError, mat1.__mul__, vec) + self.assertRaises(ValueError, vec.__mul__, mat1) mat2 = Matrix(((1, 2), (-2, 3))) |