blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Freestyle: fix for crash in the constructor of freestyle.types.StrokeVertexIterator.

This commit is contained in:
Tamito Kajiyama 2014-07-09 14:51:19 +09:00
parent 9c48ea3979
commit 02eb03f868
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
View File

@ -68,23 +68,25 @@ static int StrokeVertexIterator_init(BPy_StrokeVertexIterator *self, PyObject *a
static const char *kwlist_2[] = {"stroke", NULL};
PyObject *brother = 0, *stroke = 0;
if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_1, &StrokeVertexIterator_Type, &brother)) {
if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_1, &StrokeVertexIterator_Type, &brother)) {
self->sv_it = new StrokeInternal::StrokeVertexIterator(*(((BPy_StrokeVertexIterator *)brother)->sv_it));
self->reversed = ((BPy_StrokeVertexIterator *)brother)->reversed;
self->at_start = ((BPy_StrokeVertexIterator *)brother)->at_start;
}
else if (PyErr_Clear(),
PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_2, &Stroke_Type, &stroke))
else if (PyErr_Clear(),
PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_2, &Stroke_Type, &stroke))
{
self->sv_it = new StrokeInternal::StrokeVertexIterator(((BPy_Stroke *)stroke)->s->strokeVerticesBegin());
if (!stroke)
self->sv_it = new StrokeInternal::StrokeVertexIterator();
else
self->sv_it = new StrokeInternal::StrokeVertexIterator(((BPy_Stroke *)stroke)->s->strokeVerticesBegin());
self->reversed = false;
self->at_start = true;
}
else {
self->sv_it = new StrokeInternal::StrokeVertexIterator();
self->reversed = false;
self->at_start = true;
PyErr_SetString(PyExc_TypeError, "argument 1 must be StrokeVertexIterator or Stroke");
return -1;
}
self->py_it.it = self->sv_it;
return 0;