diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
| commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
| tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp | |
| parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
| parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) | |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index 8a09e7722ea..187ab94360a 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -81,7 +81,7 @@ static int FEdge_init(BPy_FEdge *self, PyObject *args, PyObject *kwds) self->fe = new FEdge(*(((BPy_FEdge *)obj1)->fe)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!", |