Fix outliner delete not flushing multi-object edit-mode data

1 files changed, 3 insertions, 2 deletions

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 234da323de6..c9eeb2cff20 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -46,6 +46,7 @@
 #include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_constraint.h"
+#include "BKE_object.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
@@ -678,8 +679,8 @@ static void object_delete_cb(bContext *C,
     }
 
     // check also library later
-    if (ob == CTX_data_edit_object(C)) {
-      ED_object_editmode_exit(C, EM_FREEDATA);
+    if ((ob->mode && OB_MODE_EDIT) && BKE_object_is_in_editmode(ob)) {
+      ED_object_editmode_exit_ex(bmain, scene, ob, EM_FREEDATA);
     }
     BKE_id_delete(bmain, ob);
   }