[Bf-blender-cvs] [f910342c8d1] master: Outliner: Fix useless assert in new liboverride showing code.

Bastien Montagne noreply at git.blender.org
Wed Dec 30 12:41:27 CET 2020


Commit: f910342c8d1f09a140d036b2d3583933cc126593
Author: Bastien Montagne
Date:   Wed Dec 30 12:38:53 2020 +0100
Branches: master
https://developer.blender.org/rBf910342c8d1f09a140d036b2d3583933cc126593

Outliner: Fix useless assert in new liboverride showing code.

It is perfectly 'valid' to find invalid RNA properties references in
override properties list. Data change, RNA changes, IDProperties change,
some linked ID may become unavailable, etc.

Note that those invaldi override properties are cleaned up when updating
the override info (so typically on undo step storage, and .blend file save).

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

M	source/blender/editors/space_outliner/outliner_tree.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 11894548016..f8905d772b2 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -655,7 +655,9 @@ static void outliner_add_library_override_contents(SpaceOutliner *soops, TreeEle
   int index = 0;
   LISTBASE_FOREACH (IDOverrideLibraryProperty *, op, &id->override_library->properties) {
     if (!BKE_lib_override_rna_property_find(&idpoin, op, &override_ptr, &override_prop)) {
-      BLI_assert(false);
+      /* This is fine, override properties list is not alwasy fully up-to-date with current
+       * RNA/IDProps etc., this gets cleaned up when re-generating the overrides rules, no error
+       * here. */
       continue;
     }



More information about the Bf-blender-cvs mailing list