[Bf-blender-cvs] [2b98a9269b4] master: LibOverride: Do not assert on missing operands in apply function.

Bastien Montagne noreply at git.blender.org
Mon Nov 2 11:58:15 CET 2020


Commit: 2b98a9269b46fe909f07125930651a6a8b58e8da
Author: Bastien Montagne
Date:   Mon Nov 2 11:55:26 2020 +0100
Branches: master
https://developer.blender.org/rB2b98a9269b46fe909f07125930651a6a8b58e8da

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..

===================================================================

M	source/blender/makesrna/intern/rna_collection.c

===================================================================

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;
   }



More information about the Bf-blender-cvs mailing list