diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-03-28 10:16:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-03-28 10:16:07 +0300 |
| commit | 46d980228b22b153416cd1223bb5fa3e766fac85 (patch) | |
| tree | 62853481d4ca044b1f697e43c047f5eb021dbd40 /source/blender/editors/object | |
| parent | 5b1980859ad20ad24a02589f4ad72a81a82df3ba (diff) | |
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.
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 8 |
1 files changed, 0 insertions, 8 deletions
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)); |