* Implemented Python's iterator protocol in Interface0DIterator and

orientedViewEdgeIterator.

* Simplified Python-related error handling in C++ class definitions.
The definitions of the following C++ methods were simplified and most
code segments using the C/Python API were moved to Director.cpp.

  ChainingIterator::init()
  ChainingIterator::traverse()
  UnaryPredicate0D::operator()()
  UnaryPredicate1D::operator()()
  BinaryPredicate0D::operator()()
  BinaryPredicate1D::operator()()
  UnaryFunction0D::operator()()
  UnaryFunction1D::operator()()
  StrokeShader.shade()

* Moved part of the introspection-based automatic type conversion code
from BPy_Interface0DIterator.cpp and Director.cpp to BPy_Convert.cpp
for the sake of better code organization.

* Fixed an uninitialized member in StrokeVertexIterator___init__().

1 files changed, 24 insertions, 2 deletions

diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index 45f6cadeb81..ab7e2cb4e0e 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -10,6 +10,7 @@ extern "C" {
 
 /*---------------  Python API function prototypes for orientedViewEdgeIterator instance  -----------*/
 static int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObject *args);
+static PyObject * orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator *self);
 
 static PyObject * orientedViewEdgeIterator_getObject(BPy_orientedViewEdgeIterator *self);
 
@@ -74,8 +75,8 @@ PyTypeObject orientedViewEdgeIterator_Type = {
 
   /*** Added in release 2.2 ***/
 	/*   Iterators */
-	NULL,                       /* getiterfunc tp_iter; */
-	NULL,                       /* iternextfunc tp_iternext; */
+	PyObject_SelfIter,				/* getiterfunc tp_iter; */
+	(iternextfunc)orientedViewEdgeIterator_iternext,	/* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
 	BPy_orientedViewEdgeIterator_methods,	/* struct PyMethodDef *tp_methods; */
@@ -124,10 +125,31 @@ int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObje
 	}
 	
 	self->py_it.it = self->ove_it;
+	self->reversed = 0;
 	
 	return 0;
 }
 
+PyObject * orientedViewEdgeIterator_iternext( BPy_orientedViewEdgeIterator *self ) {
+	ViewVertex::directedViewEdge *dve;
+	if (self->reversed) {
+		if (self->ove_it->isBegin()) {
+			PyErr_SetNone(PyExc_StopIteration);
+			return NULL;
+		}
+		self->ove_it->decrement();
+		dve = self->ove_it->operator->();
+	} else {
+		if (self->ove_it->isEnd()) {
+			PyErr_SetNone(PyExc_StopIteration);
+			return NULL;
+		}
+		dve = self->ove_it->operator->();
+		self->ove_it->increment();
+	}
+	return BPy_directedViewEdge_from_directedViewEdge( *dve );
+}
+
 PyObject * orientedViewEdgeIterator_getObject( BPy_orientedViewEdgeIterator *self) {
 	return BPy_directedViewEdge_from_directedViewEdge( self->ove_it->operator*() );
 }