blender
/
blender
127
395
Fork 566
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

LibOverride: Do not delete no-more-used overrides during resync if they are user-edited. 

Ultimately those will be listed with a special icon in the upcomming
Outliner overrides view.

Part of T83811 & D10649.
This commit is contained in:
Bastien Montagne 2021-03-05 09:12:40 +01:00
parent 0a6ed7f035
commit 96064c3bb7
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/lib_override.c
View File

@ -1001,11 +1001,23 @@ bool BKE_lib_override_library_resync(Main *bmain, Scene *scene, ViewLayer *view_
}
id->tag &= ~LIB_TAG_DOIT;
}
/* Also cleanup old overrides that went missing in new linked data. */
/* Also deal with old overrides that went missing in new linked data. */
else if (id->tag & LIB_TAG_MISSING && !ID_IS_LINKED(id)) {
BLI_assert(ID_IS_OVERRIDE_LIBRARY(id));
id->tag |= LIB_TAG_DOIT;
id->tag &= ~LIB_TAG_MISSING;
if (!BKE_lib_override_library_is_user_edited(id)) {
/* If user never edited them, we can delete them. */
id->tag |= LIB_TAG_DOIT;
id->tag &= ~LIB_TAG_MISSING;
printf("%s: Old override %s is being deleted.\n", __func__, id->name);
}
else {
/* Otherwise, keep them, user needs to decide whether what to do with them. */
BLI_assert((id->tag & LIB_TAG_DOIT) == 0);
id_fake_user_set(id);
printf("%s: Old override %s is being kept around as it was user-edited.\n",
__func__,
id->name);
}
}
}
FOREACH_MAIN_ID_END;