diff options
| author | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
|---|---|---|
| committer | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
| commit | 97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14 (patch) | |
| tree | fc9746d2210eda08be9d44ae67d5e58d64b48b40 /source/blender/freestyle/intern/python/BPy_Id.cpp | |
| parent | 4a7c203e9ecc7c5b0370afc0fdd6bcc183dc00df (diff) | |
| parent | f3e8326453ae856d7914e45e832a2ed80aa9a9b9 (diff) | |
merge
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Id.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/python/BPy_Id.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp index 4f61ba847f6..eb0eb661e3d 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.cpp +++ b/source/blender/freestyle/intern/python/BPy_Id.cpp @@ -75,7 +75,7 @@ static int Id_init(BPy_Id *self, PyObject *args, PyObject *kwds) if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_1, &Id_Type, &brother)) { self->id = new Id(*(((BPy_Id *)brother)->id)); } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char **)kwlist_2, &first, &second)) { self->id = new Id(first, second); } |