diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 08:46:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 08:46:52 +0400 |
| commit | 09f29c0b70357684b270745167cc30a3134b8d98 (patch) | |
| tree | 8cb909d1fa49f5f017e0a0c4d09b426a4d1bd7cb /source/blender/editors/mesh/meshtools.c | |
| parent | ea270a690387c8c65ca31610a3c8ce5f06328eac (diff) | |
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 3dfc66bce25..f6fd4b45288 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -542,9 +542,9 @@ int join_mesh_exec(bContext *C, wmOperator *op) ED_object_exit_editmode(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); #else /* toggle editmode using lower level functions so this can be called from python */ - EDBM_MakeEditBMesh(scene->toolsettings, scene, ob); - EDBM_LoadEditBMesh(scene, ob); - EDBM_FreeEditBMesh(me->edit_btmesh); + EDBM_mesh_make(scene->toolsettings, scene, ob); + EDBM_mesh_load(scene, ob); + EDBM_mesh_free(me->edit_btmesh); MEM_freeN(me->edit_btmesh); me->edit_btmesh = NULL; DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA); |