diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 18:18:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 18:18:17 +0400 |
| commit | 790374d07d68ec333fe7a56af5c1fbe57a16602e (patch) | |
| tree | 0a5984cc63d5cdd47cf4bb0e14dcac9c9ff5bb02 /source/blender/editors/mesh/meshtools.c | |
| parent | dad7afa1afaa7433bd7ee3b62a788fa19a6d2cd3 (diff) | |
code cleanup: rename editmode functions so we have ED_object_editmode_load/enter/exit
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 89fee2cdc4f..562bc4a8e02 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -566,8 +566,8 @@ int join_mesh_exec(bContext *C, wmOperator *op) DAG_relations_tag_update(bmain); // removed objects, need to rebuild dag #if 0 - ED_object_enter_editmode(C, EM_WAITCURSOR); - ED_object_exit_editmode(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); + ED_object_editmode_enter(C, EM_WAITCURSOR); + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); #else /* toggle editmode using lower level functions so this can be called from python */ EDBM_mesh_make(scene->toolsettings, scene, ob); |