bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

LibOverride: keep some anim data from liboverride when it exists in both IDs.

Browse Source 
So far when an anim data had to be created in liboverride (because none
existed in reference ID), and reference ID got an anim data added later,
that reference anim data would simply replace the one from the
liboverride, completely losing all animation-related work done so far in
the liboverride.

This commit fixes that, by adding some custom handling of anim data when
there is a liboverride operation defined on the `animation_data` RNA
property itself.

It then behaves as if everything that is overridable in the existing
liboverride was defined as overrides (and therefore kept), while
everything else is replaced by the reference animdata:
* Action and temp action are kept.
* Settings (extend mode, etc.) are kept.
* Active NLA track and strip are kept, and tracks and strips from the
  liboverride are added at the end of the list of these from the
  reference data.

Note that this behavior is only expected to happen once, on the first
call to 'apply overrides' after anim data has been added to the reference
linked ID. After that, since both IDs have animdata, there should be no
liboverride property defined for the `animation_data` property itself,
but only for paths leading inside that animdata struct.

Implements #110067.
This commit is contained in:
Bastien Montagne 2023-08-07 18:56:11 +02:00
parent 257f21d494
commit f188d6709f
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/makesrna/intern/rna_animation.cc
View File

@ -748,7 +748,9 @@ bool rna_AnimaData_override_apply(Main *bmain, RNAPropertyOverrideApplyContext &
"Unsupported RNA override operation on animdata pointer");
UNUSED_VARS_NDEBUG(ptr_storage, len_dst, len_src, len_storage, opop);
/* AnimData is a special case, since you cannot edit/replace it, it's either existent or not. */
/* AnimData is a special case, since you cannot edit/replace it, it's either existent or not.
* Further more, when an animdata is added to the linked reference later on, the one created for
* the liboverride needs to be 'merged', such that its overridable data is kept. */
AnimData *adt_dst = static_cast<AnimData *>(RNA_property_pointer_get(ptr_dst, prop_dst).data);
AnimData *adt_src = static_cast<AnimData *>(RNA_property_pointer_get(ptr_src, prop_src).data);
@ -764,6 +766,35 @@ bool rna_AnimaData_override_apply(Main *bmain, RNAPropertyOverrideApplyContext &
RNA_property_update_main(bmain, nullptr, ptr_dst, prop_dst);
return true;
}
else if (adt_dst != nullptr && adt_src != nullptr) {
/* Override had to create an anim data, but now its reference also has one, need to merge them
* by keeping the few overridable data from the liboverride, while using the animdata of the
* reference.
*
* Note that this case will not be encountered when the linked reference data already had
* anim data, since there will be no operation for the animdata pointer itself then, only
* potentially for its internal overridable data (NLA, action...). */
id_us_min(reinterpret_cast<ID *>(adt_dst->action));
adt_dst->action = adt_src->action;
id_us_plus(reinterpret_cast<ID *>(adt_dst->action));
id_us_min(reinterpret_cast<ID *>(adt_dst->tmpact));
adt_dst->tmpact = adt_src->tmpact;
id_us_plus(reinterpret_cast<ID *>(adt_dst->tmpact));
adt_dst->act_blendmode = adt_src->act_blendmode;
adt_dst->act_extendmode = adt_src->act_extendmode;
adt_dst->act_influence = adt_src->act_influence;
adt_dst->flag = adt_src->flag;
/* NLA tracks: since overrides are always after tracks from linked reference, we can 'just'
* move the whole list from `src` to the end of the list of `dst` (which currently contains
* tracks from linked reference). then active track and strip pointers can be kept as-is. */
BLI_movelisttolist(&adt_dst->nla_tracks, &adt_src->nla_tracks);
adt_dst->act_track = adt_src->act_track;
adt_dst->actstrip = adt_src->actstrip;
DEG_relations_tag_update(bmain);
ANIM_id_update(bmain, ptr_dst->owner_id);
}
return false;
}