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

Freestyle: avoid checking PyErr_Occurred and quiet warning

Browse Source
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
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"); PyErr_SetString(PyExc_TypeError, "operands must be a Nature object");
return NULL; 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"); PyErr_SetString(PyExc_ValueError, "operand 1: unexpected Nature value");
return NULL; return NULL;
} }
op2 = PyLong_AsLong(b); if ((op2 = PyLong_AsLong(b)) == -1 && PyErr_Occurred()) {
if (PyErr_Occurred()) {
PyErr_SetString(PyExc_ValueError, "operand 2: unexpected Nature value"); PyErr_SetString(PyExc_ValueError, "operand 2: unexpected Nature value");
return NULL; return NULL;
} }
switch (op) { switch (op) {
case '&': case '&':
v = op1 & op2; v = op1 & op2;
break; break;
case '^': case '^':
v = op1 ^ op2; v = op1 ^ op2;
break; break;
case '|': case '|':
v = op1 | op2; v = op1 | op2;
break; break;
default:
BLI_assert(0);
v = 0;
} }
if (v == 0) if (v == 0)
result = PyObject_NewVar(BPy_Nature, &Nature_Type, 0); result = PyObject_NewVar(BPy_Nature, &Nature_Type, 0);