diff options
author | Bastien Montagne <b.mont29@gmail.com> | 2019-11-08 16:53:19 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2019-11-08 16:53:19 +0300 |
commit | e408a62c2a4b1bec44be06b533b20ce9822d92f2 (patch) | |
tree | d4c2275f7cdbd43cf441389d8427f4b6e860a571 /source | |
parent | f47c469e900ba57a85397028e607eb54f0fc42a6 (diff) | |
parent | 76be5b5bf5c830f8a3a3640fcf439bdca3a9aa89 (diff) |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_access_compare_override.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index 18fbe7886e9..7dae3cbf339 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -890,8 +890,11 @@ static void rna_property_override_apply_ex(Main *bmain, * Note that here, src is the local saved ID, and dst is a copy of the linked ID (since we use * local ID as storage to apply local changes on top of a clean copy of the linked data). */ PointerRNA private_ptr_item_dst, private_ptr_item_src, private_ptr_item_storage; - if (opop->subitem_local_name != NULL || opop->subitem_reference_name != NULL || - opop->subitem_local_index != -1 || opop->subitem_reference_index != -1) { + if ((RNA_property_type(prop_dst) == PROP_COLLECTION && + RNA_property_type(prop_src) == PROP_COLLECTION && + (prop_storage == NULL || RNA_property_type(prop_storage) == PROP_COLLECTION)) && + (opop->subitem_local_name != NULL || opop->subitem_reference_name != NULL || + opop->subitem_local_index != -1 || opop->subitem_reference_index != -1)) { RNA_POINTER_INVALIDATE(&private_ptr_item_dst); RNA_POINTER_INVALIDATE(&private_ptr_item_src); RNA_POINTER_INVALIDATE(&private_ptr_item_storage); |