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/object/object_edit.c | |
| parent | dad7afa1afaa7433bd7ee3b62a788fa19a6d2cd3 (diff) | |
code cleanup: rename editmode functions so we have ED_object_editmode_load/enter/exit
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index b21bbdb0b92..12400209866 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -372,7 +372,7 @@ bool ED_object_editmode_load(Object *obedit) return ED_object_editmode_load_ex(obedit, false); } -void ED_object_exit_editmode(bContext *C, int flag) +void ED_object_editmode_exit(bContext *C, int flag) { /* Note! only in exceptional cases should 'EM_DO_UNDO' NOT be in the flag */ /* Note! if 'EM_FREEDATA' isn't in the flag, use ED_object_editmode_load directly */ @@ -420,7 +420,7 @@ void ED_object_exit_editmode(bContext *C, int flag) } -void ED_object_enter_editmode(bContext *C, int flag) +void ED_object_editmode_enter(bContext *C, int flag) { Scene *scene = CTX_data_scene(C); Base *base = NULL; @@ -557,9 +557,9 @@ static int editmode_toggle_exec(bContext *C, wmOperator *UNUSED(op)) ToolSettings *toolsettings = CTX_data_tool_settings(C); if (!CTX_data_edit_object(C)) - ED_object_enter_editmode(C, EM_WAITCURSOR); + ED_object_editmode_enter(C, EM_WAITCURSOR); else - ED_object_exit_editmode(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */ + ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */ ED_space_image_uv_sculpt_update(CTX_wm_manager(C), toolsettings); @@ -609,7 +609,7 @@ static int posemode_exec(bContext *C, wmOperator *UNUSED(op)) if (base->object->type == OB_ARMATURE) { if (base->object == CTX_data_edit_object(C)) { - ED_object_exit_editmode(C, EM_FREEDATA | EM_DO_UNDO); + ED_object_editmode_exit(C, EM_FREEDATA | EM_DO_UNDO); ED_armature_enter_posemode(C, base); } else if (base->object->mode & OB_MODE_POSE) |