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/Director.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/Director.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/Director.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp index 011609bb343..ed98bfee63f 100644 --- a/source/blender/freestyle/intern/python/Director.cpp +++ b/source/blender/freestyle/intern/python/Director.cpp @@ -252,13 +252,13 @@ int Director_BPy_UnaryFunction0D___call__(void *uf0D, PyObject *obj, Interface0D } else if (BPy_UnaryFunction0DVec2f_Check(obj)) { Vec2f vec; - if (!Vec2f_ptr_from_Vector(result, &vec)) + if (!Vec2f_ptr_from_Vector(result, vec)) return -1; ((UnaryFunction0D<Vec2f> *)uf0D)->result = vec; } else if (BPy_UnaryFunction0DVec3f_Check(obj)) { Vec3f vec; - if (!Vec3f_ptr_from_Vector(result, &vec)) + if (!Vec3f_ptr_from_Vector(result, vec)) return -1; ((UnaryFunction0D<Vec3f> *)uf0D)->result = vec; } @@ -304,13 +304,13 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, PyObject *obj, Interface1D } else if (BPy_UnaryFunction1DVec2f_Check(obj)) { Vec2f vec; - if (!Vec2f_ptr_from_Vector(result, &vec)) + if (!Vec2f_ptr_from_Vector(result, vec)) return -1; ((UnaryFunction1D<Vec2f> *)uf1D)->result = vec; } else if (BPy_UnaryFunction1DVec3f_Check(obj)) { Vec3f vec; - if (!Vec3f_ptr_from_Vector(result, &vec)) + if (!Vec3f_ptr_from_Vector(result, vec)) return -1; ((UnaryFunction1D<Vec3f> *)uf1D)->result = vec; } |