kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Freestyle: Fixed a crash due to missing call of StrokeShader.__init__() in Python.

Browse Source 
Many thanks to the problem report by flokkievids (Folkert de Vries)
through a comment in Patch D963.
This commit is contained in:
Tamito Kajiyama 2015-04-22 23:19:43 +09:00
parent 798facbff3
commit 3da7226844
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/freestyle/intern/python/BPy_Operators.cpp
View File

@ -34,6 +34,8 @@
#include "BPy_StrokeShader.h" #include "BPy_StrokeShader.h"
#include "BPy_Convert.h" #include "BPy_Convert.h"
#include <sstream>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -539,7 +541,15 @@ static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyOb
PyErr_SetString(PyExc_TypeError, "Operators.create(): 2nd argument must be a list of StrokeShader objects"); PyErr_SetString(PyExc_TypeError, "Operators.create(): 2nd argument must be a list of StrokeShader objects");
return NULL; return NULL;
} }
shaders.push_back(((BPy_StrokeShader *)py_ss)->ss); StrokeShader *shader = ((BPy_StrokeShader *)py_ss)->ss;
if (!shader) {
stringstream ss;
ss << "Operators.create(): item " << (i + 1)
<< " of the shaders list is invalid likely due to missing call of StrokeShader.__init__()";
PyErr_SetString(PyExc_TypeError, ss.str().c_str());
return NULL;
}
shaders.push_back(shader);
} }
if (Operators::create(*(((BPy_UnaryPredicate1D *)obj1)->up1D), shaders) < 0) { if (Operators::create(*(((BPy_UnaryPredicate1D *)obj1)->up1D), shaders) < 0) {
if (!PyErr_Occurred()) if (!PyErr_Occurred())