From fc97e91a3efd7dec5f21ec0a8ba6b81a1db7b72d Mon Sep 17 00:00:00 2001 From: Maxime Curioni Date: Thu, 24 Jul 2008 21:32:50 +0000 Subject: soc-2008-mxcurioni: found and fixed all potential issues iterating over internal view-map data. The internal namespaces (ViewEdgeInternal, ViewVertexInternal, CurveInternal, StrokeInternal...) should NOT be included to prevent redefintion errors. --- source/blender/freestyle/intern/python/BPy_Convert.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source/blender/freestyle/intern/python/BPy_Convert.h') diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index db0b5e589d2..87d902f28a8 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -1,6 +1,7 @@ #ifndef FREESTYLE_PYTHON_CONVERT_H #define FREESTYLE_PYTHON_CONVERT_H + #include "../geometry/Geom.h" using namespace Geometry; @@ -22,6 +23,17 @@ using namespace Geometry; // NonTVertex, TVertex, ViewEdge, ViewMap, ViewShape, ViewVertex #include "../view_map/ViewMap.h" +// ViewVertexInternal::orientedViewEdgeIterator +// ViewEdgeInternal::SVertexIterator +// ViewEdgeInternal::ViewEdgeIterator +#include "../view_map/ViewMapIterators.h" +//##################### IMPORTANT ##################### +// Do not use the following namespaces within this file : +// - ViewVertexInternal +// - ViewEdgeInternal +//########################################################## + + #ifdef __cplusplus extern "C" { #endif @@ -45,6 +57,7 @@ PyObject * BPy_Id_from_Id( Id& id ); PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D ); PyObject * BPy_Nature_from_Nature( unsigned short n ); PyObject * BPy_MediumType_from_MediumType( int n ); +PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it ); PyObject * BPy_SShape_from_SShape( SShape& ss ); PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa ); PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv ); -- cgit v1.2.3