[Bf-blender-cvs] [921708fc76d] master: Fix (unreported) potential bug in collections parenting update code.

Bastien Montagne noreply at git.blender.org
Wed Dec 22 17:53:25 CET 2021


Commit: 921708fc76d13f5793699fb31b4efb7cd78ebd4e
Author: Bastien Montagne
Date:   Wed Dec 22 17:50:10 2021 +0100
Branches: master
https://developer.blender.org/rB921708fc76d13f5793699fb31b4efb7cd78ebd4e

Fix (unreported) potential bug in collections parenting update code.

Own mistake in rB2ef192a55b2c. Did not seem to have any visible effect
though...

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

M	source/blender/blenkernel/intern/collection.c

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

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 892b47a7d2e..e6ce4eb9440 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1618,7 +1618,7 @@ static void collection_parents_rebuild_recursive(Collection *collection)
 
   LISTBASE_FOREACH (CollectionChild *, child, &collection->children) {
     /* See comment above in `BKE_collection_parent_relations_rebuild`. */
-    if ((collection->id.tag & (LIB_TAG_NO_MAIN | LIB_TAG_COPIED_ON_WRITE)) != 0) {
+    if ((child->collection->id.tag & (LIB_TAG_NO_MAIN | LIB_TAG_COPIED_ON_WRITE)) != 0) {
       continue;
     }
     collection_parents_rebuild_recursive(child->collection);



More information about the Bf-blender-cvs mailing list