Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-11-02 13:55:26 +0300
committerBastien Montagne <bastien@blender.org>2020-11-02 13:58:01 +0300
commit2b98a9269b46fe909f07125930651a6a8b58e8da (patch)
tree83b3d16fc0699dab6578ffd325ccd0d5e5e28197 /source/blender/makesrna
parentf2c7b4a1c54e27bc7df3f51871f8767c9f280f37 (diff)
LibOverride: Do not assert on missing operands in apply function.
This can happen after some changes in lib file and resync in user file e.g..
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_collection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index df1d7abd6b1..90414613fdd 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -275,7 +275,7 @@ static bool rna_Collection_children_override_apply(Main *bmain,
Collection *coll_dst = (Collection *)ptr_dst->owner_id;
if (ptr_item_dst->type == NULL || ptr_item_src->type == NULL) {
- BLI_assert(0 && "invalid source or destination sub-collection.");
+ /* This can happen when reference and overrides differ, just ignore then. */
return false;
}