[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22024] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/python: Added minor changes.

[Tamito Kajiyama]

Revision: 22024
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22024
Author:   kjym3
Date:     2009-07-29 20:49:03 +0200 (Wed, 29 Jul 2009)

Log Message:
-----------
Added minor changes.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp	2009-07-29 18:44:54 UTC (rev 22023)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp	2009-07-29 18:49:03 UTC (rev 22024)
@@ -134,7 +134,7 @@
 
   /*** Added in release 2.2 ***/
 	/*   Iterators */
-	Stroke___iter__,            /* getiterfunc tp_iter; */
+	(getiterfunc)Stroke___iter__,            /* getiterfunc tp_iter; */
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/

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	2009-07-29 18:44:54 UTC (rev 22023)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp	2009-07-29 18:49:03 UTC (rev 22024)
@@ -11,7 +11,7 @@
 
 /*---------------  Python API function prototypes for StrokeVertexIterator instance  -----------*/
 static int StrokeVertexIterator___init__(BPy_StrokeVertexIterator *self, PyObject *args);
-static PyObject * StrokeVertexIterator_iternext( PyObject *obj );
+static PyObject * StrokeVertexIterator_iternext( BPy_StrokeVertexIterator *self );
 static PyObject * StrokeVertexIterator_t( BPy_StrokeVertexIterator *self );
 static PyObject * StrokeVertexIterator_u( BPy_StrokeVertexIterator *self );
 static PyObject * StrokeVertexIterator_castToInterface0DIterator( BPy_StrokeVertexIterator *self );
@@ -141,17 +141,20 @@
 	return 0;
 }
 
-PyObject * StrokeVertexIterator_iternext( PyObject *obj ) {
-	BPy_StrokeVertexIterator *self = (BPy_StrokeVertexIterator *)obj;
+PyObject * StrokeVertexIterator_iternext( BPy_StrokeVertexIterator *self ) {
 	StrokeVertex *sv;
 	if (self->reversed) {
-		if (self->sv_it->isBegin())
+		if (self->sv_it->isBegin()) {
+			PyErr_SetNone(PyExc_StopIteration);
 			return NULL;
+		}
 		self->sv_it->decrement();
 		sv = self->sv_it->operator->();
 	} else {
-		if (self->sv_it->isEnd())
+		if (self->sv_it->isEnd()) {
+			PyErr_SetNone(PyExc_StopIteration);
 			return NULL;
+		}
 		sv = self->sv_it->operator->();
 		self->sv_it->increment();
 	}