blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Freestyle: avoid checking PyErr_Occurred and quiet warning

This commit is contained in:
Campbell Barton 2014-03-13 11:54:59 +11:00
parent 2d0997766d
commit 37cf28b341
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/freestyle/intern/python/BPy_Nature.cpp
View File

@ -268,26 +268,28 @@ static PyObject *BPy_Nature_bitwise(PyObject *a, int op, PyObject *b)
PyErr_SetString(PyExc_TypeError, "operands must be a Nature object");
return NULL;
}
op1 = PyLong_AsLong(a);
if (PyErr_Occurred()) {
if ((op1 = PyLong_AsLong(a)) == -1 && PyErr_Occurred()) {
PyErr_SetString(PyExc_ValueError, "operand 1: unexpected Nature value");
return NULL;
}
op2 = PyLong_AsLong(b);
if (PyErr_Occurred()) {
if ((op2 = PyLong_AsLong(b)) == -1 && PyErr_Occurred()) {
PyErr_SetString(PyExc_ValueError, "operand 2: unexpected Nature value");
return NULL;
}
switch (op) {
case '&':
v = op1 & op2;
break;
case '^':
v = op1 ^ op2;
break;
case '|':
v = op1 | op2;
break;
case '&':
v = op1 & op2;
break;
case '^':
v = op1 ^ op2;
break;
case '|':
v = op1 | op2;
break;
default:
BLI_assert(0);
v = 0;
}
if (v == 0)
result = PyObject_NewVar(BPy_Nature, &Nature_Type, 0);