diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-12-17 11:01:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-17 11:01:15 +0400 |
commit | f1a989f9c35d496842b2cfa44d90ee0019c06e22 (patch) | |
tree | 002c1f7a8f1c90c233d7d11f67959ad1f49ae125 /source/blender/freestyle/intern/python/BPy_Convert.cpp | |
parent | 61fb34a622d5f05e551e0342c05df946bd11fcb1 (diff) |
Fix crash in freestyle vector parsing (hard to believe nobody noticed)
Vectors were being assigned as an array of classes in Vec2f_ptr_from_PyObject and similar functions,
rather then assigning a number to each axis.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Convert.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_Convert.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp index 8dcad1ff769..9a28189fe3e 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.cpp +++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp @@ -512,7 +512,7 @@ Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj) return static_cast<Nature::EdgeNature>(PyLong_AsLong(obj)); } -bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f *vec) +bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f &vec) { if (Vec2f_ptr_from_Vector(obj, vec)) return true; @@ -523,7 +523,7 @@ bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f *vec) return false; } -bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f *vec) +bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f &vec) { if (Vec3f_ptr_from_Vector(obj, vec)) return true; @@ -536,7 +536,7 @@ bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f *vec) return false; } -bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r *vec) +bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r &vec) { if (Vec3r_ptr_from_Vector(obj, vec)) return true; @@ -549,7 +549,7 @@ bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r *vec) return false; } -bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f *vec) +bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f &vec) { if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 2) return false; @@ -560,7 +560,7 @@ bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f *vec) return true; } -bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f *vec) +bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f &vec) { if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3) return false; @@ -572,7 +572,7 @@ bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f *vec) return true; } -bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r *vec) +bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r &vec) { if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3) return false; @@ -584,7 +584,7 @@ bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r *vec) return true; } -bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f *vec) +bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f &vec) { if (!ColorObject_Check(obj)) return false; @@ -596,7 +596,7 @@ bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f *vec) return true; } -bool Vec3r_ptr_from_Color(PyObject *obj, Vec3r *vec) +bool Vec3r_ptr_from_Color(PyObject *obj, Vec3r &vec) { if (!ColorObject_Check(obj)) return false; @@ -620,7 +620,7 @@ static bool float_array_from_PyList(PyObject *obj, float *v, int n) return 1; } -bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f *vec) +bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f &vec) { float v[2]; @@ -633,7 +633,7 @@ bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f *vec) return true; } -bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f *vec) +bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f &vec) { float v[3]; @@ -647,7 +647,7 @@ bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f *vec) return true; } -bool Vec3r_ptr_from_PyList(PyObject *obj, Vec3r *vec) +bool Vec3r_ptr_from_PyList(PyObject *obj, Vec3r &vec) { float v[3]; @@ -673,7 +673,7 @@ static bool float_array_from_PyTuple(PyObject *obj, float *v, int n) return 1; } -bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f *vec) +bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f &vec) { float v[2]; @@ -686,7 +686,7 @@ bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f *vec) return true; } -bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f *vec) +bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f &vec) { float v[3]; @@ -700,7 +700,7 @@ bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f *vec) return true; } -bool Vec3r_ptr_from_PyTuple(PyObject *obj, Vec3r *vec) +bool Vec3r_ptr_from_PyTuple(PyObject *obj, Vec3r &vec) { float v[3]; |