diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-01 01:03:22 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-01 01:03:22 +0400 |
commit | 4e78dff6291e6a6fea1a030ce75a190d14b00c79 (patch) | |
tree | ef5f8932a44938e47f381a01a08bdbca96b5fd62 | |
parent | 3771d648d0a39c14e942725849e42f1898240809 (diff) |
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.
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_StrokeShader.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp index c53f1e7d888..1bc5b007d12 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp @@ -289,8 +289,17 @@ PyObject *StrokeShader_shade( BPy_StrokeShader *self , PyObject *args) { 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; } |