[Bf-blender-cvs] [46d980228b2] master: Fix T86992: Tagged ID deletion conflicts with freeing objects

[Campbell Barton]

Commit: 46d980228b22b153416cd1223bb5fa3e766fac85
Author: Campbell Barton
Date:   Sun Mar 28 18:16:07 2021 +1100
Branches: master
https://developer.blender.org/rB46d980228b22b153416cd1223bb5fa3e766fac85

Fix T86992: Tagged ID deletion conflicts with freeing objects

Check LIB_TAG_COPIED_ON_WRITE instead of LIB_TAG_NO_MAIN,
matching the behavior of rigid-body shared data.

===================================================================

M	source/blender/blenkernel/intern/softbody.c
M	source/blender/editors/object/object_add.c

===================================================================

diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index de88e8a941c..d52e4443ac1 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3181,9 +3181,11 @@ void sbFree(Object *ob)
     return;
   }
 
+  const bool is_orig = (ob->id.tag & LIB_TAG_COPIED_ON_WRITE) == 0;
+
   free_softbody_intern(sb);
 
-  if ((ob->id.tag & LIB_TAG_NO_MAIN) == 0) {
+  if (is_orig) {
     /* Only free shared data on non-CoW copies */
     BKE_ptcache_free_list(&sb->shared->ptcaches);
     sb->shared->pointcache = NULL;
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 246c97c6078..c0b31d6ed65 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1997,15 +1997,7 @@ static int object_delete_exec(bContext *C, wmOperator *op)
   }
 
   if (tagged_count > 0) {
-#if 0 /* Temporary workaround for bug in tagged delete, see: T86992 */
     BKE_id_multi_tagged_delete(bmain);
-#else
-    LISTBASE_FOREACH_MUTABLE (Object *, ob, &bmain->objects) {
-      if (ob->id.tag & LIB_TAG_DOIT) {
-        BKE_id_delete(bmain, &ob->id);
-      }
-    }
-#endif
   }
 
   BKE_reportf(op->reports, RPT_INFO, "Deleted %u object(s)", (changed_count + tagged_count));