[Bf-blender-cvs] [0d772221c64] blender-v2.91-release: Fix T82149: Blender crash when using collection user_id remapping (python).

Bastien Montagne noreply at git.blender.org
Wed Oct 28 11:07:56 CET 2020


Commit: 0d772221c64187b5004dd687888042f44603257d
Author: Bastien Montagne
Date:   Wed Oct 28 11:04:49 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rB0d772221c64187b5004dd687888042f44603257d

Fix T82149: Blender crash when using collection user_id remapping (python).

Not sure why Collection was the only ID for which depsgraph building did
not check for potential recursion?

Reviewed By: sergey

Maniphest Tasks: T82149

Differential Revision: https://developer.blender.org/D9365

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index ec5cbc5c605..bac36885dfc 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -591,13 +591,13 @@ void DepsgraphRelationBuilder::build_collection(LayerCollection *from_layer_coll
      * recurses into all the nested objects and collections. */
     return;
   }
-  build_idproperties(collection->id.properties);
   const bool group_done = built_map_.checkIsBuiltAndTag(collection);
   OperationKey object_transform_final_key(object != nullptr ? &object->id : nullptr,
                                           NodeType::TRANSFORM,
                                           OperationCode::TRANSFORM_FINAL);
   ComponentKey duplicator_key(object != nullptr ? &object->id : nullptr, NodeType::DUPLI);
   if (!group_done) {
+    build_idproperties(collection->id.properties);
     LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
       build_object(cob->ob);
     }



More information about the Bf-blender-cvs mailing list