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

Fix/refactor `BKE_id_clear_newpoin` and `BKE_main_id_newptr_and_tag_clear`. 

Those were not clearing embdeed IDs flags and `newid` pointers at all...
This commit is contained in:
Bastien Montagne 2021-09-16 12:14:21 +02:00
parent 236a9f0814
commit 1fce66190a
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/blenkernel/intern/lib_id.c
View File

@ -338,10 +338,29 @@ void id_fake_user_clear(ID *id)
void BKE_id_clear_newpoin(ID *id)
{
if (id->newid) {
id->newid->tag &= ~LIB_TAG_NEW;
/* We assume that if this ID has no new ID, its embedded data has not either. */
if (id->newid == NULL) {
return;
}
id->newid->tag &= ~LIB_TAG_NEW;
id->newid = NULL;
/* Deal with embedded data too. */
Key *key = BKE_key_from_id(id);
if (key != NULL) {
BKE_id_clear_newpoin(&key->id);
}
bNodeTree *ntree = ntreeFromID(id);
if (ntree != NULL) {
BKE_id_clear_newpoin(&ntree->id);
}
if (GS(id->name) == ID_SCE) {
Collection *master_collection = ((Scene *)id)->master_collection;
if (master_collection != NULL) {
BKE_id_clear_newpoin(&master_collection->id);
}
}
}
static int lib_id_expand_local_cb(LibraryIDLinkCallbackData *cb_data)
@ -1763,8 +1782,7 @@ void BKE_main_id_newptr_and_tag_clear(Main *bmain)
ID *id;
FOREACH_MAIN_ID_BEGIN (bmain, id) {
id->newid = NULL;
id->tag &= ~LIB_TAG_NEW;
BKE_id_clear_newpoin(id);
}
FOREACH_MAIN_ID_END;
}