diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
| commit | 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch) | |
| tree | b7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp | |
| parent | 9b416c66fb714bdfd15a481489dbf650d0f389ea (diff) | |
| parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) | |
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp index 725daa80b5e..5db75c84608 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -75,7 +75,7 @@ static int FEdgeSharp_init(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds) self->fes = new FEdgeSharp(*(((BPy_FEdgeSharp *)obj1)->fes)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!", |