Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-12-17 11:01:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-17 11:01:15 +0400
commitf1a989f9c35d496842b2cfa44d90ee0019c06e22 (patch)
tree002c1f7a8f1c90c233d7d11f67959ad1f49ae125 /source/blender/freestyle/intern/python/BPy_Convert.h
parent61fb34a622d5f05e551e0342c05df946bd11fcb1 (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.h')
-rw-r--r--source/blender/freestyle/intern/python/BPy_Convert.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index b7e798dfa63..89171ef5152 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -150,20 +150,20 @@ bool bool_from_PyBool(PyObject *b);
IntegrationType IntegrationType_from_BPy_IntegrationType(PyObject *obj);
Stroke::MediumType MediumType_from_BPy_MediumType(PyObject *obj);
Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj);
-bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f *vec);
-bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f *vec);
-bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r *vec);
-bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f *vec);
-bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f *vec);
-bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r *vec);
-bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f *vec);
-bool Vec3r_ptr_from_Color(PyObject *obj, Vec3r *vec);
-bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f *vec);
-bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f *vec);
-bool Vec3r_ptr_from_PyList(PyObject *obj, Vec3r *vec);
-bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f *vec);
-bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f *vec);
-bool Vec3r_ptr_from_PyTuple(PyObject *obj, Vec3r *vec);
+bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f &vec);
+bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f &vec);
+bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r &vec);
+bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f &vec);
+bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f &vec);
+bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r &vec);
+bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f &vec);
+bool Vec3r_ptr_from_Color(PyObject *obj, Vec3r &vec);
+bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f &vec);
+bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f &vec);
+bool Vec3r_ptr_from_PyList(PyObject *obj, Vec3r &vec);
+bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f &vec);
+bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f &vec);
+bool Vec3r_ptr_from_PyTuple(PyObject *obj, Vec3r &vec);
bool float_array_from_PyObject(PyObject *obj, float *v, int n);