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

Improvements in error handling at Python-C++ boundaries.

Browse Source
This commit is contained in:
Tamito Kajiyama
2009-03-20 22:41:27 +00:00
parent 6ba34d18b5
commit 0c7e5323e8
24 changed files with 280 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
View File

@@ -170,13 +170,17 @@ PyObject * UnaryFunction1DFloat___call__( BPy_UnaryFunction1DFloat *self, PyObje
{
PyObject *obj;
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
cout << "ERROR: UnaryFunction1DFloat___call__ " << endl;
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) )
return NULL;
if (self->uf1D_float->operator()(*( ((BPy_Interface1D *) obj)->if1D )) < 0) {
if (!PyErr_Occurred()) {
string msg(self->uf1D_float->getName() + " __call__ method failed");
PyErr_SetString(PyExc_RuntimeError, msg.c_str());
}
return NULL;
}
float f = self->uf1D_float->operator()(*( ((BPy_Interface1D *) obj)->if1D ));
return PyFloat_FromDouble( f );
return PyFloat_FromDouble( self->uf1D_float->result );
}
@@ -184,10 +188,8 @@ PyObject * UnaryFunction1DFloat_setIntegrationType(BPy_UnaryFunction1DFloat* sel
{
PyObject *obj;
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
cout << "ERROR: UnaryFunction1DFloat_setIntegrationType " << endl;
Py_RETURN_NONE;
}
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) )
return NULL;
self->uf1D_float->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
Py_RETURN_NONE;