diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-10 05:02:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-10 05:02:07 +0300 |
commit | 11f9938eedc9efc42a6319fbc0f8583aac23d469 (patch) | |
tree | 3dcfddedfc3f03d3ec1f9c31b4c9a664073a1686 /source/blender/editors/object/object_edit.c | |
parent | 002d0bd344739f6beb76b5f3073def0866d5ad56 (diff) |
Clenaup: remove unused EM_WAITCURSOR
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
-rw-r--r-- | source/blender/editors/object/object_edit.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 25e3fa848d6..09ea2188de7 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -124,7 +124,6 @@ static void move_to_collection_menus_items(struct uiLayout *layout, struct MoveT /* ************* XXX **************** */ static void error(const char *UNUSED(arg)) {} -static void waitcursor(int UNUSED(val)) {} /* port over here */ static void error_libdata(void) {} @@ -517,15 +516,12 @@ bool ED_object_editmode_exit_ex(Main *bmain, Scene *scene, Object *obedit, int f { const bool freedata = (flag & EM_FREEDATA) != 0; - if (flag & EM_WAITCURSOR) waitcursor(1); - if (ED_object_editmode_load_ex(bmain, obedit, freedata) == false) { /* in rare cases (background mode) its possible active object * is flagged for editmode, without 'obedit' being set [#35489] */ if (UNLIKELY(obedit && obedit->mode & OB_MODE_EDIT)) { obedit->mode &= ~OB_MODE_EDIT; } - if (flag & EM_WAITCURSOR) waitcursor(0); return true; } @@ -552,8 +548,6 @@ bool ED_object_editmode_exit_ex(Main *bmain, Scene *scene, Object *obedit, int f obedit->mode &= ~OB_MODE_EDIT; } - if (flag & EM_WAITCURSOR) waitcursor(0); - return (obedit->mode & OB_MODE_EDIT) == 0; } @@ -583,8 +577,6 @@ bool ED_object_editmode_enter_ex(Main *bmain, Scene *scene, Object *ob, int flag return false; } - if (flag & EM_WAITCURSOR) waitcursor(1); - ob->restore_mode = ob->mode; ob->mode = OB_MODE_EDIT; @@ -649,8 +641,6 @@ bool ED_object_editmode_enter_ex(Main *bmain, Scene *scene, Object *ob, int flag WM_main_add_notifier(NC_SCENE | ND_MODE | NS_MODE_OBJECT, scene); } - if (flag & EM_WAITCURSOR) waitcursor(0); - return (ob->mode & OB_MODE_EDIT) != 0; } @@ -691,24 +681,24 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op) } if (!is_mode_set) { - ED_object_editmode_enter(C, EM_WAITCURSOR); + ED_object_editmode_enter(C, 0); if (obact->mode & mode_flag) { FOREACH_SELECTED_OBJECT_BEGIN(view_layer, v3d, ob) { if ((ob != obact) && (ob->type == obact->type)) { - ED_object_editmode_enter_ex(bmain, scene, ob, EM_WAITCURSOR | EM_NO_CONTEXT); + ED_object_editmode_enter_ex(bmain, scene, ob, EM_NO_CONTEXT); } } FOREACH_SELECTED_OBJECT_END; } } else { - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); + ED_object_editmode_exit(C, EM_FREEDATA); if ((obact->mode & mode_flag) == 0) { FOREACH_OBJECT_BEGIN(view_layer, ob) { if ((ob != obact) && (ob->type == obact->type)) { - ED_object_editmode_exit_ex(bmain, scene, ob, EM_FREEDATA | EM_WAITCURSOR); + ED_object_editmode_exit_ex(bmain, scene, ob, EM_FREEDATA); } } FOREACH_OBJECT_END; |