Commit: 37cf28b3412f0d888b16e793360b9d064be1aa25
Author: Campbell Barton
Date: Thu Mar 13 11:54:59 2014 +1100
https://developer.blender.org/rB37cf28b3412f0d888b16e793360b9d064be1aa25
Freestyle: avoid checking PyErr_Occurred and quiet warning
===================================================================
M source/blender/freestyle/intern/python/BPy_Nature.cpp
===================================================================
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.cpp
b/source/blender/freestyle/intern/python/BPy_Nature.cpp
index bf571ba..bf27bc1 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
@@ -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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
