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

Freestyle: Fix for StrokeVertexIterator.__next__() ignoring the first and only element. 

A StrokeVertexIterator ignores the first element when it is the only element.
Such an iterator can be created by the .incremented() method from an iterator
over two stroke vertices.

This problem is a regression from 2.71.  The present fix is appropriate to backport
if Blender 2.72a is planned.

Problem report by Kazuhiro Murakawa through personal communications, thanks!
This commit is contained in:
Tamito Kajiyama 2014-10-10 18:45:47 +09:00
parent 642c8243e7
commit 5fdbb793ff
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
View File

@ -120,14 +120,20 @@ static PyObject *Interface0DIterator_iternext(BPy_Interface0DIterator *self)
self->if0D_it->decrement();
}
else {
if (self->if0D_it->atLast() || self->if0D_it->isEnd()) {
if (self->if0D_it->isEnd()) {
PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
if (self->at_start)
else if (self->at_start) {
self->at_start = false;
else
}
else if (self->if0D_it->atLast()) {
PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
else {
self->if0D_it->increment();
}
}
Interface0D *if0D = self->if0D_it->operator->();
return Any_BPy_Interface0D_from_Interface0D(*if0D);

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

@ -115,19 +115,25 @@ static PyObject *StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self)
self->sv_it->decrement();
}
else {
/* if sv_it.isEnd() is true, the iterator can't be incremented. if sv_it.isLast() is true,
* the iterator is currently pointing to the final valid argument. Incrementing it further would
* give a python object that can't be dereferenced. */
if (self->sv_it->atLast() || self->sv_it->isEnd()) {
/* If sv_it.isEnd() is true, the iterator can't be incremented. */
if (self->sv_it->isEnd()) {
PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
/* if at the start of the iterator, only return the object
* and don't increment, to keep for-loops in sync */
if (self->at_start)
/* If at the start of the iterator, only return the object
* and don't increment, to keep for-loops in sync */
else if (self->at_start) {
self->at_start = false;
else
}
/* If sv_it.atLast() is true, the iterator is currently pointing to the final valid element.
* Incrementing it further would lead to a state that the iterator can't be dereferenced. */
else if (self->sv_it->atLast()) {
PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
else {
self->sv_it->increment();
}
}
StrokeVertex *sv = self->sv_it->operator->();
return BPy_StrokeVertex_from_StrokeVertex(*sv);