1 files changed, 34 insertions, 9 deletions

diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index 3a246263efa..e6a01808305 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -76,41 +76,66 @@ static int Interface0DIterator_init(BPy_Interface0DIterator *self, PyObject *arg
 
 	if (PyArg_ParseTupleAndKeywords(args, kwds, "O&", (char **)kwlist_1, convert_nested_it, &nested_it)) {
 		self->if0D_it = new Interface0DIterator(nested_it->copy());
+        self->at_start = true;
+        self->reversed = false;
 	}
 	else if (PyErr_Clear(),
 	         PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_2, &Interface0DIterator_Type, &brother))
 	{
 		self->if0D_it = new Interface0DIterator(*(((BPy_Interface0DIterator *)brother)->if0D_it));
+        self->at_start = ((BPy_Interface0DIterator *)brother)->at_start;
+        self->reversed = ((BPy_Interface0DIterator *)brother)->reversed;
 	}
 	else {
 		PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
 		return -1;
 	}
 	self->py_it.it = self->if0D_it;
-	self->reversed = 0;
 	return 0;
 }
 
-static PyObject *Interface0DIterator_iternext(BPy_Interface0DIterator *self)
+static PyObject *Interface0DIterator_iter(BPy_Interface0DIterator *self)
 {
-	Interface0D *if0D;
+    Py_INCREF(self);
+    self->at_start = true;
+    return (PyObject *) self;
+}
 
+static PyObject *Interface0DIterator_iternext(BPy_Interface0DIterator *self)
+{
 	if (self->reversed) {
 		if (self->if0D_it->isBegin()) {
 			PyErr_SetNone(PyExc_StopIteration);
 			return NULL;
 		}
-		self->if0D_it->decrement();
-		if0D = self->if0D_it->operator->();
+
+        if (self->at_start)
+            self->at_start = false;
+        else {
+            self->if0D_it->decrement();
+            if (self->if0D_it->isBegin()) {
+                PyErr_SetNone(PyExc_StopIteration);
+                return NULL;
+            }
+        }
+
 	}
 	else {
 		if (self->if0D_it->isEnd()) {
 			PyErr_SetNone(PyExc_StopIteration);
 			return NULL;
 		}
-		if0D = self->if0D_it->operator->();
-		self->if0D_it->increment();
-	}
+        if (self->at_start)
+            self->at_start = false;
+        else {
+            self->if0D_it->increment();
+            if (self->if0D_it->isEnd()) {
+                PyErr_SetNone(PyExc_StopIteration);
+                return NULL;
+            }
+        }
+    }
+    Interface0D *if0D = self->if0D_it->operator->();
 	return Any_BPy_Interface0D_from_Interface0D(*if0D);
 }
 
@@ -186,7 +211,7 @@ PyTypeObject Interface0DIterator_Type = {
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
 	0,                              /* tp_weaklistoffset */
-	PyObject_SelfIter,              /* tp_iter */
+    (getiterfunc)Interface0DIterator_iter, /* tp_iter */
 	(iternextfunc)Interface0DIterator_iternext, /* tp_iternext */
 	0,                              /* tp_methods */
 	0,                              /* tp_members */