griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Geometry nodes not depending on instanced collections properly

Browse Source 
Geometry nodes were not adding referenced instanced collections as
dependencies to depsgraph.

This would lead to meshes and data not being ready on evaluation in
certain cases.
This commit is contained in:
Sebastian Parborg
2021-02-22 20:26:51 +01:00
parent 441c660270
commit 3d2d8a1aab
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/modifiers/intern/MOD_nodes.cc
View File

@@ -151,11 +151,20 @@ static void find_used_ids_from_settings(const NodesModifierSettings &settings, S
&ids);
}
static void add_collection_object_relations_recursive(const ModifierUpdateDepsgraphContext *ctx,
Collection &collection);
static void add_object_relation(const ModifierUpdateDepsgraphContext *ctx, Object &object)
{
DEG_add_object_relation(ctx->node, &object, DEG_OB_COMP_TRANSFORM, "Nodes Modifier");
if (&(ID &)object != &ctx->object->id) {
if (object.type != OB_EMPTY) {
if (object.type == OB_EMPTY) {
Collection *collection_instance = object.instance_collection;
if (collection_instance != nullptr) {
add_collection_object_relations_recursive(ctx, *collection_instance);
}
}
else {
DEG_add_object_relation(ctx->node, &object, DEG_OB_COMP_GEOMETRY, "Nodes Modifier");
}
}