archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Walk all the overriding chain to try to find a template.

Browse Source 
When one creates a new local static override from another linked
data-block already overriding a third one etc., walk the whole
inheritance chain up to the original ancestor to try to find an
overriding template, instead of only checking the immediate reference...
This commit is contained in:
Bastien Montagne
2017-12-09 10:26:08 +01:00
parent 48fe46943e
commit 75fbd60b06
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,16 +66,26 @@ IDOverrideStatic *BKE_override_static_init(ID *local_id, ID *reference_id)
BLI_assert(reference_id == NULL || reference_id->lib != NULL);
BLI_assert(local_id->override_static == NULL);
if (reference_id != NULL && reference_id->override_static != NULL && reference_id->override_static->reference == NULL) {
/* reference ID has an override template, use it! */
BKE_override_static_copy(local_id, reference_id);
ID *ancestor_id;
for (ancestor_id = reference_id;
ancestor_id != NULL && ancestor_id->override_static != NULL && ancestor_id->override_static->reference != NULL;
ancestor_id = ancestor_id->override_static->reference);
if (ancestor_id != NULL && ancestor_id->override_static != NULL) {
/* Original ID has a template, use it! */
BKE_override_static_copy(local_id, ancestor_id);
if (local_id->override_static->reference != reference_id) {
id_us_min(local_id->override_static->reference);
local_id->override_static->reference = reference_id;
id_us_plus(local_id->override_static->reference);
}
return local_id->override_static;
}
/* Else, generate new empty override. */
local_id->override_static = MEM_callocN(sizeof(*local_id->override_static), __func__);
local_id->override_static->reference = reference_id;
id_us_plus(reference_id);
id_us_plus(local_id->override_static->reference);
local_id->tag &= ~LIB_TAG_OVERRIDESTATIC_OK;
/* TODO do we want to add tag or flag to referee to mark it as such? */
return local_id->override_static;