[Bf-blender-cvs] [244cef6f00b] master: LibOverride: Do not assert when failing to apply an override rule.

Bastien Montagne noreply at git.blender.org
Thu Sep 24 18:15:11 CEST 2020


Commit: 244cef6f00bcd5e96dbd24db786afd44f07daf9b
Author: Bastien Montagne
Date:   Thu Sep 24 18:10:22 2020 +0200
Branches: master
https://developer.blender.org/rB244cef6f00bcd5e96dbd24db786afd44f07daf9b

LibOverride: Do not assert when failing to apply an override rule.

This is actually fairly common issue if lib data changes, just print out
an info message about it for now.

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

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

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

diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c
index ac4553349cc..c97f5c4c52e 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.c
+++ b/source/blender/makesrna/intern/rna_access_compare_override.c
@@ -975,9 +975,9 @@ static void rna_property_override_apply_ex(Main *bmain,
                                                ptr_item_src,
                                                ptr_item_storage,
                                                opop)) {
-      /* TODO No assert here, would be much much better to just report as warning,
-       * failing override applications will probably be fairly common! */
-      BLI_assert(0);
+      printf("Failed to apply '%s' override operation on %s\n",
+             op->rna_path,
+             ptr_src->owner_id->name);
     }
   }
 }



More information about the Bf-blender-cvs mailing list