diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-04-26 20:21:24 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-04-26 20:21:24 +0300 |
| commit | 607cd463b3c9ddbd9f8a5fdb7a0bb47dd2937bef (patch) | |
| tree | bc4446a1020242767589e1fc0463c761583f2316 /source/blender | |
| parent | eb0d6808516497655a159645b7e1796f734909db (diff) | |
| parent | 49b3d00c10b8df7fad21ca664b1eebe171c2c361 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index b8cab43f676..0f8b613f7ac 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -654,7 +654,7 @@ void DepsgraphRelationBuilder::build_collection(LayerCollection *from_layer_coll /* An instance is part of the geometry of the collection. */ if (cob->ob->type == OB_EMPTY) { - Collection *collection_instance = object->instance_collection; + Collection *collection_instance = cob->ob->instance_collection; if (collection_instance != nullptr) { OperationKey collection_instance_key{ &collection_instance->id, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL_DONE}; |