Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-03-13 16:00:59 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-03-13 16:00:59 +0400
commit899caeae498434462d0cb4775c10944929d325c4 (patch)
treeb5b8a366278ff6008a5d69b4efe74eab4f2b45b9 /source/blender/freestyle/intern/python/BPy_Nature.cpp
parent01412650733547bd56b8fafced09b0e0a43ae728 (diff)
Freestyle: Fix for a potential implementation error in the Python wrapper of the Nature class.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Nature.cpp')
-rw-r--r--source/blender/freestyle/intern/python/BPy_Nature.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.cpp b/source/blender/freestyle/intern/python/BPy_Nature.cpp
index bf27bc1d4ed..deedbb93981 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
@@ -288,8 +288,8 @@ static PyObject *BPy_Nature_bitwise(PyObject *a, int op, PyObject *b)
v = op1 | op2;
break;
default:
- BLI_assert(0);
- v = 0;
+ PyErr_BadArgument();
+ return NULL;
}
if (v == 0)
result = PyObject_NewVar(BPy_Nature, &Nature_Type, 0);