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.

1 files changed, 8 insertions, 7 deletions

diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index be1f946302f..649447f1db6 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -121,21 +121,22 @@ int SVertexIterator___init__(BPy_SVertexIterator *self, PyObject *args )
 	    return -1;
 
 	if( !obj1 ){
-		self->sv_it = new SVertexIterator();
+		self->sv_it = new ViewEdgeInternal::SVertexIterator();
 		
 	} else if( BPy_SVertexIterator_Check(obj1) ) {
-		self->sv_it = new SVertexIterator(*( ((BPy_SVertexIterator *) obj1)->sv_it ));
+		self->sv_it = new ViewEdgeInternal::SVertexIterator(*( ((BPy_SVertexIterator *) obj1)->sv_it ));
 	
 	} else if(  obj1 && BPy_SVertex_Check(obj1) &&
 	 			obj2 && BPy_SVertex_Check(obj2) &&
 				obj3 && BPy_FEdge_Check(obj3) &&
 				obj4 && BPy_FEdge_Check(obj4) ) {
 
-		self->sv_it = new SVertexIterator(	((BPy_SVertex *) obj1)->sv,
-											((BPy_SVertex *) obj2)->sv,
-											((BPy_FEdge *) obj3)->fe,
-											((BPy_FEdge *) obj4)->fe,
-											f );
+		self->sv_it = new ViewEdgeInternal::SVertexIterator(
+							((BPy_SVertex *) obj1)->sv,
+							((BPy_SVertex *) obj2)->sv,
+							((BPy_FEdge *) obj3)->fe,
+							((BPy_FEdge *) obj4)->fe,
+							f );
 			
 	} else {
 		return -1;