blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Link/Append: Fix unreported obdata being instantiated even when already used by linked/appended data. 

Do not instantiate obdata when it is not actually loose.
This commit is contained in:
Bastien Montagne 2021-09-09 11:46:28 +02:00
parent 284c9430f9
commit 93d2940603
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenloader/intern/readfile.c
View File

@ -4561,6 +4561,17 @@ static void add_loose_object_data_to_scene(Main *mainvar,
active_collection = lc->collection;
}
/* Do not re-instantiate obdata IDs that are already instantiated by an object. */
LISTBASE_FOREACH (Object *, ob, &mainvar->objects) {
if ((ob->id.tag & LIB_TAG_PRE_EXISTING) == 0 && ob->data != NULL) {
ID *obdata = ob->data;
BLI_assert(ID_REAL_USERS(obdata) > 0);
if ((obdata->tag & LIB_TAG_PRE_EXISTING) == 0) {
obdata->tag &= ~LIB_TAG_DOIT;
}
}
}
/* Loop over all ID types, instancing object-data for ID types that have support for it. */
ListBase *lbarray[INDEX_ID_MAX];
int i = set_listbasepointers(mainvar, lbarray);