[Bf-blender-cvs] [6f53988e7af] master: Cleanup: proper handling of `LIB_TAG_DOIT` in append code.
Bastien Montagne
noreply at git.blender.org
Thu Sep 23 13:01:55 CEST 2021
Commit: 6f53988e7afbedddc2c442b49622860ebee41bcc
Author: Bastien Montagne
Date: Thu Sep 23 12:46:51 2021 +0200
Branches: master
https://developer.blender.org/rB6f53988e7afbedddc2c442b49622860ebee41bcc
Cleanup: proper handling of `LIB_TAG_DOIT` in append code.
===================================================================
M source/blender/windowmanager/intern/wm_files_link.c
===================================================================
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)) ?
More information about the Bf-blender-cvs
mailing list