diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-11-12 06:28:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-11-12 06:28:26 +0400 |
| commit | ef1bc03fce51e2d79551ae87f2f8c7af8f0c6295 (patch) | |
| tree | 3aebe75f81c63213b9dc6be4f8b2d52c7a46bcb3 /source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp | |
| parent | 59e46005261ea2739fe3d3009ac7cc43fdfa6833 (diff) | |
Fix #37092 and #37381: crashes in the .object() method of Freestyle iterators.
Now the method checks if the iterator is at the end, and returns None if that is the case.
Diffstat (limited to 'source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index 3e2f0102dc3..91e8de118a9 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -175,6 +175,8 @@ PyDoc_STRVAR(ChainingIterator_object_doc, static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void *UNUSED(closure)) { + if (self->c_it->isEnd()) + Py_RETURN_NONE; ViewEdge *ve = self->c_it->operator*(); if (ve) return BPy_ViewEdge_from_ViewEdge(*ve); |