[Bf-blender-cvs] [e53e17b8d64] master: Fix outliner edit-mode check
Campbell Barton
noreply at git.blender.org
Sun Mar 15 12:06:08 CET 2020
Commit: e53e17b8d64607d996f08c5f5d3ca107ab1261a3
Author: Campbell Barton
Date: Sun Mar 15 21:56:05 2020 +1100
Branches: master
https://developer.blender.org/rBe53e17b8d64607d996f08c5f5d3ca107ab1261a3
Fix outliner edit-mode check
===================================================================
M source/blender/editors/space_outliner/outliner_tools.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 4cd93b5d257..a99e1b63119 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -678,8 +678,8 @@ static void object_delete_cb(bContext *C,
return;
}
- // check also library later
- if ((ob->mode && OB_MODE_EDIT) && BKE_object_is_in_editmode(ob)) {
+ /* Check also library later. */
+ 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);
More information about the Bf-blender-cvs
mailing list