[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22093] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/python/BPy_StrokeShader.cpp: Added Python error handling to StrokeShader::shade().
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Fri Jul 31 23:03:22 CEST 2009
Revision: 22093
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22093
Author: kjym3
Date: 2009-07-31 23:03:22 +0200 (Fri, 31 Jul 2009)
Log Message:
-----------
Added Python error handling to StrokeShader::shade(). Also made
a measure to avoid an infinite loop due to non-proper overriding
of the shade method.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp 2009-07-31 20:35:14 UTC (rev 22092)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp 2009-07-31 21:03:22 UTC (rev 22093)
@@ -289,8 +289,17 @@
if(!( PyArg_ParseTuple(args, "O!", &Stroke_Type, &py_s) ))
return NULL;
- self->ss->shade(*( ((BPy_Stroke *) py_s)->s ));
-
+ if( typeid(*(self->ss)) == typeid(StrokeShader) ) {
+ PyErr_SetString(PyExc_TypeError, "shade method not properly overridden");
+ return NULL;
+ }
+ if (self->ss->shade(*( ((BPy_Stroke *) py_s)->s )) < 0) {
+ if (!PyErr_Occurred()) {
+ string msg(self->ss->getName() + " shade method failed");
+ PyErr_SetString(PyExc_RuntimeError, msg.c_str());
+ }
+ return NULL;
+ }
Py_RETURN_NONE;
}
More information about the Bf-blender-cvs
mailing list