diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
| commit | 5b643018348280ee601a20fb9329d5a313c23446 (patch) | |
| tree | b2bb37028ac88a655aea37bb7a8b850b84885cea /source/blender/python/bmesh | |
| parent | f6743fcaa4fbccd4bd8a92c44a3cd4bd2d153fd1 (diff) | |
| parent | 2d3d76693a84224b86eac50729fb5a321753b7e3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/bmesh')
| -rw-r--r-- | source/blender/python/bmesh/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/bmesh/CMakeLists.txt b/source/blender/python/bmesh/CMakeLists.txt index 4d3230fa3e9..48213b7eed5 100644 --- a/source/blender/python/bmesh/CMakeLists.txt +++ b/source/blender/python/bmesh/CMakeLists.txt @@ -18,7 +18,7 @@ # # ***** END GPL LICENSE BLOCK ***** -set(INC +set(INC . ../../bmesh ../../blenkernel diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index a6ed92d139c..c6a67a1b2dd 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -2153,7 +2153,7 @@ static PyObject *bpy_bmedgeseq_new(BPy_BMElemSeq *self, PyObject *args) if (vert_array == NULL) { return NULL; } - + if (BM_edge_exists(vert_array[0], vert_array[1])) { PyErr_SetString(PyExc_ValueError, "edges.new(): this edge exists"); |