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/space_outliner | |
| parent | 002d0bd344739f6beb76b5f3073def0866d5ad56 (diff) | |
Clenaup: remove unused EM_WAITCURSOR
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index d9e069f75c2..a4bcb612e9e 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -102,10 +102,10 @@ static void do_outliner_activate_obdata(bContext *C, Scene *scene, ViewLayer *vi if (ob->type == obact->type) { bool ok; if (BKE_object_is_in_editmode(ob)) { - ok = ED_object_editmode_exit_ex(bmain, scene, ob, EM_FREEDATA | EM_WAITCURSOR); + ok = ED_object_editmode_exit_ex(bmain, scene, ob, EM_FREEDATA); } else { - ok = ED_object_editmode_enter_ex(CTX_data_main(C), scene, ob, EM_WAITCURSOR | EM_NO_CONTEXT); + ok = ED_object_editmode_enter_ex(CTX_data_main(C), scene, ob, EM_NO_CONTEXT); } if (ok) { ED_object_base_select(base, (ob->mode & OB_MODE_EDIT) ? BA_SELECT : BA_DESELECT); @@ -323,7 +323,7 @@ static eOLDrawState tree_element_set_active_object( } if (ob != OBEDIT_FROM_VIEW_LAYER(view_layer)) { - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); + ED_object_editmode_exit(C, EM_FREEDATA); } } return OL_DRAWSEL_NORMAL; diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 5806cf28fa8..5df9d5f4ac4 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -451,7 +451,7 @@ static void object_delete_cb( // check also library later if (ob == CTX_data_edit_object(C)) { - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); + ED_object_editmode_exit(C, EM_FREEDATA); } ED_object_base_free_and_unlink(CTX_data_main(C), scene, ob); /* leave for ED_outliner_id_unref to handle */ @@ -883,7 +883,7 @@ static void object_delete_hierarchy_cb( /* Check also library later. */ for (; obedit && (obedit != base->object); obedit = obedit->parent); if (obedit == base->object) { - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); + ED_object_editmode_exit(C, EM_FREEDATA); } outline_delete_hierarchy(C, reports, scene, base); |