archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Added Python error handling to StrokeShader::shade(). Also made

Browse Source 
a measure to avoid an infinite loop due to non-proper overriding
of the shade method.
This commit is contained in:
Tamito Kajiyama
2009-07-31 21:03:22 +00:00
parent 3771d648d0
commit 4e78dff629
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
View File

@@ -289,8 +289,17 @@ PyObject *StrokeShader_shade( BPy_StrokeShader *self , PyObject *args) {
if(!( PyArg_ParseTuple(args, "O!", &Stroke_Type, &py_s) )) if(!( PyArg_ParseTuple(args, "O!", &Stroke_Type, &py_s) ))
return NULL; 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; Py_RETURN_NONE;
} }