diff options
Diffstat (limited to 'source/blender/freestyle/intern/python/Iterator')
7 files changed, 20 insertions, 17 deletions
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp index 71105c6896c..99404b2f907 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -148,9 +148,9 @@ PyObject * AdjacencyIterator_iternext(BPy_AdjacencyIterator *self) { PyErr_SetNone(PyExc_StopIteration); return NULL; } - ViewEdge *ve = self->a_it->operator->(); + ViewEdge *ve = self->a_it->operator*(); self->a_it->increment(); - return BPy_ViewEdge_from_ViewEdge_ptr( ve ); + return BPy_ViewEdge_from_ViewEdge( *ve ); } PyObject * AdjacencyIterator_isIncoming(BPy_AdjacencyIterator *self) { @@ -161,7 +161,7 @@ PyObject * AdjacencyIterator_getObject(BPy_AdjacencyIterator *self) { ViewEdge *ve = self->a_it->operator*(); if( ve ) - return BPy_ViewEdge_from_ViewEdge_ptr( ve ); + return BPy_ViewEdge_from_ViewEdge( *ve ); Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index 40a984c2cab..678510c1f7d 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -180,8 +180,9 @@ PyObject *ChainingIterator_traverse( BPy_ChainingIterator *self, PyObject *args PyObject *ChainingIterator_getVertex( BPy_ChainingIterator *self ) { - if( self->c_it->getVertex() ) - return BPy_ViewVertex_from_ViewVertex_ptr( self->c_it->getVertex() ); + ViewVertex *v = self->c_it->getVertex(); + if( v ) + return Any_BPy_ViewVertex_from_ViewVertex( *v ); Py_RETURN_NONE; } @@ -194,7 +195,7 @@ PyObject * ChainingIterator_getObject( BPy_ChainingIterator *self) { ViewEdge *ve = self->c_it->operator*(); if( ve ) - return BPy_ViewEdge_from_ViewEdge_ptr( ve ); + return BPy_ViewEdge_from_ViewEdge( *ve ); Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp index 490c8fdf70f..a98053a89a8 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp @@ -156,7 +156,7 @@ PyObject * CurvePointIterator_castToInterface0DIterator( BPy_CurvePointIterator } PyObject * CurvePointIterator_getObject(BPy_CurvePointIterator *self) { - return BPy_CurvePoint_from_CurvePoint_ptr( &(self->cp_it->operator*()) ); + return BPy_CurvePoint_from_CurvePoint( self->cp_it->operator*() ); } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index 4a9d601de25..165d368158f 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -146,7 +146,7 @@ PyObject * Interface0DIterator_iternext( BPy_Interface0DIterator *self ) { if0D = self->if0D_it->operator->(); self->if0D_it->increment(); } - return BPy_Interface0D_from_Interface0D( *if0D ); + return Any_BPy_Interface0D_from_Interface0D( *if0D ); } PyObject * Interface0DIterator_t( BPy_Interface0DIterator *self ) { @@ -158,7 +158,7 @@ PyObject * Interface0DIterator_u( BPy_Interface0DIterator *self ) { } PyObject * Interface0DIterator_getObject(BPy_Interface0DIterator *self) { - return BPy_Interface0D_from_Interface0D( self->if0D_it->operator*() ); + return Any_BPy_Interface0D_from_Interface0D( self->if0D_it->operator*() ); } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp index f7cca5941b4..7bc9c31326c 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp @@ -164,7 +164,7 @@ PyObject * SVertexIterator_getObject( BPy_SVertexIterator *self) { SVertex *sv = self->sv_it->operator->(); if( sv ) - return BPy_SVertex_from_SVertex_ptr( sv ); + return BPy_SVertex_from_SVertex( *sv ); Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 86af40ebc36..25caf684b59 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -159,7 +159,7 @@ PyObject * StrokeVertexIterator_iternext( BPy_StrokeVertexIterator *self ) { sv = self->sv_it->operator->(); self->sv_it->increment(); } - return BPy_StrokeVertex_from_StrokeVertex_ptr( sv ); + return BPy_StrokeVertex_from_StrokeVertex( *sv ); } PyObject * StrokeVertexIterator_t( BPy_StrokeVertexIterator *self ) { @@ -178,7 +178,7 @@ PyObject * StrokeVertexIterator_castToInterface0DIterator( BPy_StrokeVertexItera PyObject * StrokeVertexIterator_getObject( BPy_StrokeVertexIterator *self) { StrokeVertex *sv = self->sv_it->operator->(); if( sv ) - return BPy_StrokeVertex_from_StrokeVertex_ptr( sv ); + return BPy_StrokeVertex_from_StrokeVertex( *sv ); Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index ae1ceaf5da1..0385b8078ce 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -157,8 +157,9 @@ int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args ) PyObject *ViewEdgeIterator_getCurrentEdge( BPy_ViewEdgeIterator *self ) { - if( self->ve_it->getCurrentEdge() ) - return BPy_ViewEdge_from_ViewEdge_ptr( self->ve_it->getCurrentEdge() ); + ViewEdge *ve = self->ve_it->getCurrentEdge(); + if( ve ) + return BPy_ViewEdge_from_ViewEdge( *ve ); Py_RETURN_NONE; } @@ -176,8 +177,9 @@ PyObject *ViewEdgeIterator_setCurrentEdge( BPy_ViewEdgeIterator *self, PyObject PyObject *ViewEdgeIterator_getBegin( BPy_ViewEdgeIterator *self ) { - if( self->ve_it->getBegin() ) - return BPy_ViewEdge_from_ViewEdge_ptr( self->ve_it->getBegin() ); + ViewEdge *ve = self->ve_it->getBegin(); + if( ve ) + return BPy_ViewEdge_from_ViewEdge( *ve ); Py_RETURN_NONE; } @@ -218,7 +220,7 @@ PyObject * ViewEdgeIterator_getObject( BPy_ViewEdgeIterator *self) { ViewEdge *ve = self->ve_it->operator*(); if( ve ) - return BPy_ViewEdge_from_ViewEdge_ptr( ve ); + return BPy_ViewEdge_from_ViewEdge( *ve ); Py_RETURN_NONE; } |