blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Jacques Lucke 2021-04-26 19:21:24 +02:00
parent eb0d680851 49b3d00c10
commit 607cd463b3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -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};