Commit: e9e2813fbef6275e033f6f4e01246a1d08a64d2e
Author: Tamito Kajiyama
Date: Sat Feb 1 16:30:14 2014 +0900
https://developer.blender.org/rBe9e2813fbef6275e033f6f4e01246a1d08a64d2e
Fix for iterators' at_start flag left unset in C++ to Python conversion utility
functions.
Also changed the type of the 'reversed' flag from int to bool.
===================================================================
M source/blender/freestyle/intern/python/BPy_Convert.cpp
M source/blender/freestyle/intern/python/BPy_Convert.h
===================================================================
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp
b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 9a28189..50dde3a 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -410,14 +410,16 @@ PyObject
*BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it)
PyObject *py_a_it =
AdjacencyIterator_Type.tp_new(&AdjacencyIterator_Type, 0, 0);
((BPy_AdjacencyIterator *)py_a_it)->a_it = new AdjacencyIterator(a_it);
((BPy_AdjacencyIterator *)py_a_it)->py_it.it = ((BPy_AdjacencyIterator
*)py_a_it)->a_it;
+ ((BPy_AdjacencyIterator *)py_a_it)->at_start= true;
return py_a_it;
}
-PyObject
*BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it,
int reversed)
+PyObject
*BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it,
bool reversed)
{
PyObject *py_if0D_it =
Interface0DIterator_Type.tp_new(&Interface0DIterator_Type, 0, 0);
((BPy_Interface0DIterator *)py_if0D_it)->if0D_it = new
Interface0DIterator(if0D_it);
((BPy_Interface0DIterator *)py_if0D_it)->py_it.it =
((BPy_Interface0DIterator *)py_if0D_it)->if0D_it;
+ ((BPy_Interface0DIterator *)py_if0D_it)->at_start= true;
((BPy_Interface0DIterator *)py_if0D_it)->reversed = reversed;
return py_if0D_it;
}
@@ -430,11 +432,12 @@ PyObject
*BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePoi
return py_cp_it;
}
-PyObject
*BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator&
sv_it, int reversed)
+PyObject
*BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator&
sv_it, bool reversed)
{
PyObject *py_sv_it =
StrokeVertexIterator_Type.tp_new(&StrokeVertexIterator_Type, 0, 0);
((BPy_StrokeVertexIterator *)py_sv_it)->sv_it = new
StrokeInternal::StrokeVertexIterator(sv_it);
((BPy_StrokeVertexIterator *)py_sv_it)->py_it.it =
((BPy_StrokeVertexIterator *)py_sv_it)->sv_it;
+ ((BPy_StrokeVertexIterator *)py_sv_it)->at_start= true;
((BPy_StrokeVertexIterator *)py_sv_it)->reversed = reversed;
return py_sv_it;
}
@@ -447,11 +450,12 @@ PyObject
*BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIter
return py_sv_it;
}
-PyObject
*BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator&
ove_it, int reversed)
+PyObject
*BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator&
ove_it, bool reversed)
{
PyObject *py_ove_it =
orientedViewEdgeIterator_Type.tp_new(&orientedViewEdgeIterator_Type, 0, 0);
((BPy_orientedViewEdgeIterator *)py_ove_it)->ove_it = new
ViewVertexInternal::orientedViewEdgeIterator(ove_it);
((BPy_orientedViewEdgeIterator *)py_ove_it)->py_it.it =
((BPy_orientedViewEdgeIterator *)py_ove_it)->ove_it;
+ ((BPy_orientedViewEdgeIterator *)py_ove_it)->at_start= true;
((BPy_orientedViewEdgeIterator *)py_ove_it)->reversed = reversed;
return py_ove_it;
}
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h
b/source/blender/freestyle/intern/python/BPy_Convert.h
index 89171ef..45fc05a 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -130,13 +130,13 @@ PyObject * BPy_Chain_from_Chain(Chain& c);
PyObject * BPy_ViewShape_from_ViewShape(ViewShape& vs);
PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator&
a_it);
-PyObject *
BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it,
int reversed);
+PyObject *
BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it,
bool reversed);
PyObject *
BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator&
cp_it);
PyObject *
BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator&
sv_it,
- int reversed);
+ bool reversed);
PyObject *
BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator&
sv_it);
PyObject *
BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator&
ove_it,
- int
reversed);
+ bool
reversed);
PyObject *
BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator&
ve_it);
PyObject * BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it);
PyObject *
BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator&
cp_it);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
