diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
| commit | cdc31c3e6e953b8e10c757db113b7a60f701e1dd (patch) | |
| tree | 6bb85293faf6b7ab7ad7e8d169106584590fbc94 /source/blender/python/bmesh | |
| parent | 49d51a1e6246f00233abf54a8b24b5d829848e44 (diff) | |
| parent | 40dbf2fc0000f2905d436fc28b93a9b97431f72d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/bmesh')
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index fc0cd9e475b..224c8295a9b 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -650,7 +650,7 @@ static PyObject *bpy_bm_utils_face_join(PyObject *UNUSED(self), PyObject *args) bool do_remove = true; if (!PyArg_ParseTuple( - args, "O|i:face_join", + args, "O|O&:face_join", &py_face_array, PyC_ParseBool, &do_remove)) { |