From e0e6229176573484431d2bbf3ba0c2f849522789 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Feb 2019 18:05:18 +1100 Subject: Cleanup: rename Mesh.edit_btmesh -> edit_mesh When bmesh was in a branch we had both edit_mesh and edit_btmesh, now there is no reason to use this odd name. --- source/blender/python/bmesh/bmesh_py_api.c | 8 ++++---- source/blender/python/bmesh/bmesh_py_types.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/python') diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c index b7315ac12df..3f2b9c164e2 100644 --- a/source/blender/python/bmesh/bmesh_py_api.c +++ b/source/blender/python/bmesh/bmesh_py_api.c @@ -94,13 +94,13 @@ static PyObject *bpy_bm_from_edit_mesh(PyObject *UNUSED(self), PyObject *value) return NULL; } - if (me->edit_btmesh == NULL) { + if (me->edit_mesh == NULL) { PyErr_SetString(PyExc_ValueError, "The mesh must be in editmode"); return NULL; } - bm = me->edit_btmesh->bm; + bm = me->edit_mesh->bm; return BPy_BMesh_CreatePyObject(bm, BPY_BMFLAG_IS_WRAPPED); } @@ -141,7 +141,7 @@ static PyObject *bpy_bm_update_edit_mesh(PyObject *UNUSED(self), PyObject *args, return NULL; } - if (me->edit_btmesh == NULL) { + if (me->edit_mesh == NULL) { PyErr_SetString(PyExc_ValueError, "The mesh must be in editmode"); return NULL; @@ -150,7 +150,7 @@ static PyObject *bpy_bm_update_edit_mesh(PyObject *UNUSED(self), PyObject *args, { extern void EDBM_update_generic(BMEditMesh *em, const bool do_tessface, const bool is_destructive); - EDBM_update_generic(me->edit_btmesh, do_loop_triangles, is_destructive); + EDBM_update_generic(me->edit_mesh, do_loop_triangles, is_destructive); } Py_RETURN_NONE; diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index ddd86fa01c2..8997aab6773 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -890,7 +890,7 @@ static PyObject *bpy_bmesh_to_mesh(BPy_BMesh *self, PyObject *args) } /* we could allow this but its almost certainly _not_ what script authors want */ - if (me->edit_btmesh) { + if (me->edit_mesh) { PyErr_Format(PyExc_ValueError, "to_mesh(): Mesh '%s' is in editmode", me->id.name + 2); return NULL; -- cgit v1.2.3