From ba9943e4a7a6c671e427c08fc11845168a30e86a Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Fri, 31 Jul 2009 22:13:48 +0000 Subject: * 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__(). --- .../blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp') diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index 541391e05a7..a44e2feed5b 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -204,12 +204,12 @@ PyObject * FrsCurve_nSegments( BPy_FrsCurve *self ) { PyObject * FrsCurve_verticesBegin( BPy_FrsCurve *self ) { Interface0DIterator if0D_it( self->c->verticesBegin() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * FrsCurve_verticesEnd( BPy_FrsCurve *self ) { Interface0DIterator if0D_it( self->c->verticesEnd() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } @@ -220,7 +220,7 @@ PyObject * FrsCurve_pointsBegin( BPy_FrsCurve *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->c->pointsBegin(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args ) { @@ -230,7 +230,7 @@ PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->c->pointsEnd(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } -- cgit v1.2.3