Merge branch 'master' into blender2.8

2017-08-25 20:45:16 +10:00
parent 0e29a97813 16377abda8
commit f8f6f8f26e
7 changed files with 66 additions and 43 deletions
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -135,7 +135,7 @@ static int bpy_bm_elem_hflag_set(BPy_BMElem *self, PyObject *value, void *flag)
 	else {
 		BM_elem_flag_set(self->ele, hflag, param);
 	}
-	return -1;
+	return 0;
 }

 PyDoc_STRVAR(bpy_bm_elem_index_doc,