[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28912] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/python/Iterator: * Fix for a crash in StrokeVertexIterator::getObject().

[Tamito Kajiyama]

Revision: 28912
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28912
Author:   kjym3
Date:     2010-05-21 23:27:32 +0200 (Fri, 21 May 2010)

Log Message:
-----------
* Fix for a crash in StrokeVertexIterator::getObject().
* Minor docstring fixes.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp	2010-05-21 21:26:03 UTC (rev 28911)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp	2010-05-21 21:27:32 UTC (rev 28912)
@@ -60,7 +60,7 @@
 "      already been chained must be ignored ot not.\n"
 "   :type iRestrictToUnvisited: bool\n"
 "   :arg begin: The ViewEdge from where to start the iteration.\n"
-"   :type begin: :class:`ViewEdge`\n"
+"   :type begin: :class:`ViewEdge` or None\n"
 "   :arg orientation: If true, we'll look for the next ViewEdge among\n"
 "      the ViewEdges that surround the ending ViewVertex of begin.  If\n"
 "      false, we'll search over the ViewEdges surrounding the ending\n"

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp	2010-05-21 21:26:03 UTC (rev 28911)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp	2010-05-21 21:27:32 UTC (rev 28912)
@@ -31,7 +31,7 @@
 "      to stay within the set of selected ViewEdges or not.\n"
 "   :type iRestrictToSelection: bool\n"
 "   :arg begin: The ViewEdge from where to start the iteration.\n"
-"   :type begin: :class:`ViewEdge`\n"
+"   :type begin: :class:`ViewEdge` or None\n"
 "   :arg orientation: If true, we'll look for the next ViewEdge among\n"
 "      the ViewEdges that surround the ending ViewVertex of begin.  If\n"
 "      false, we'll search over the ViewEdges surrounding the ending\n"

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp	2010-05-21 21:26:03 UTC (rev 28911)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp	2010-05-21 21:27:32 UTC (rev 28912)
@@ -128,6 +128,8 @@
 "   :rtype: :class:`StrokeVertex`\n";
 
 static PyObject * StrokeVertexIterator_getObject( BPy_StrokeVertexIterator *self) {
+	if (!self->reversed && self->sv_it->isEnd())
+		Py_RETURN_NONE;
 	StrokeVertex *sv = self->sv_it->operator->();
 	if( sv )	
 		return BPy_StrokeVertex_from_StrokeVertex( *sv );

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp	2010-05-21 21:26:03 UTC (rev 28911)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp	2010-05-21 21:27:32 UTC (rev 28912)
@@ -24,7 +24,7 @@
 "   orientation.\n"
 "\n"
 "   :arg begin: The ViewEdge from where to start the iteration.\n"
-"   :type begin: :class:`ViewEdge`\n"
+"   :type begin: :class:`ViewEdge` or None\n"
 "   :arg orientation: If true, we'll look for the next ViewEdge among\n"
 "      the ViewEdges that surround the ending ViewVertex of begin.  If\n"
 "      false, we'll search over the ViewEdges surrounding the ending\n"