diff options
author | Bastien Montagne <bastien@blender.org> | 2020-06-09 20:35:11 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-06-10 10:38:34 +0300 |
commit | edb4e553f506c858e7df5e45ad6235cd59a181eb (patch) | |
tree | 0d7b7a652fab333f2f45cdbdd348f35353703a3f /source/blender/makesrna/intern/rna_access_compare_override.c | |
parent | 2d1b560a4e29567e4d9c3b964dc7d6a7bfd8056c (diff) |
LibOverride: Fix issues related to ID name differences.
Local datablocks (including overrides) need to have a unique name, which
can then differ from the reference linked one (especially when there are
several local overrides of a same linked data).
Issue is, ID name is a 'rna name property', and as such used as
reference when dealing with override of collections of IDs, so we cannot
have a changing name.
The solution implemented here should work and is simple, but it may have
some issues in corner cases (time will say), it is not really robust.
Alternative solution would be to store ID pointers as reference in
override operations, instead of there name. But that would potentially
add quiet a lot of overhead to foreach looping in `lib_query.c`.
Diffstat (limited to 'source/blender/makesrna/intern/rna_access_compare_override.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_access_compare_override.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index fbd86d78472..265e83ddcba 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -636,6 +636,10 @@ bool RNA_struct_override_matches(Main *bmain, continue; } + if (RNA_property_override_flag(prop_local) & PROPOVERRIDE_IGNORE) { + continue; + } + #if 0 /* This actually makes things slower, since it has to check for animation paths etc! */ if (RNA_property_animated(ptr_local, prop_local)) { /* We cannot do anything here really, animation is some kind of dynamic overrides that has |