Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2021-09-23 13:46:51 +0300
committerBastien Montagne <bastien@blender.org>2021-09-23 13:46:51 +0300
commit6f53988e7afbedddc2c442b49622860ebee41bcc (patch)
tree6b7910d668152a148adfdc3092bc4bc4f0ee6cfa
parentce96a75c2cb17c255226c8b56f85231ce0578811 (diff)
Cleanup: proper handling of `LIB_TAG_DOIT` in append code.
-rw-r--r--source/blender/windowmanager/intern/wm_files_link.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index aa23f3523d3..817947f2161 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -573,6 +573,8 @@ static void wm_append_loose_data_instantiate(WMLinkAppendData *lapp_data,
ob, object_set_selected, object_set_active, view_layer, v3d);
copy_v3_v3(ob->loc, scene->cursor.location);
+
+ id->tag &= ~LIB_TAG_DOIT;
}
}
@@ -656,8 +658,8 @@ static void wm_append_do(WMLinkAppendData *lapp_data,
}
BLI_assert(item->customdata == NULL);
- /* Clear tag previously used to mark IDs needing post-processing (instantiation of loose
- * objects etc.). */
+ /* In Append case linked IDs should never be marked as needing post-processing (instantiation
+ * of loose objects etc.). */
BLI_assert((id->tag & LIB_TAG_DOIT) == 0);
ID *existing_local_id = BKE_idtype_idcode_append_is_reusable(GS(id->name)) ?