blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

WIP: Closures and deferred evaluation for geometry nodes #107842

Draft
Lukas Tönne wants to merge 35 commits from LukasTonne/blender:geometry-nodes-closures into main
pull from: LukasTonne/blender:geometry-nodes-closures
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 35 Files Changed 34 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 31a2afb11f - Show all commits

5
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -1832,9 +1832,8 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
else if (id_type == ID_VF) {
build_vfont((VFont *)id);
}
else if (ELEM(bnode->type, NODE_GROUP, NODE_CUSTOM_GROUP)) {
bNodeTree *group_ntree = (bNodeTree *)id;
build_nodetree(group_ntree);
else if (id_type == ID_NT) {
build_nodetree((bNodeTree *)id);
}
else {
BLI_assert_msg(0, "Unknown ID type used for node");

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

@ -2730,7 +2730,7 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
ComponentKey vfont_key(id, NodeType::GENERIC_DATABLOCK);
add_relation(vfont_key, ntree_output_key, "VFont -> Node");
}
else if (ELEM(bnode->type, NODE_GROUP, NODE_CUSTOM_GROUP)) {
else if (id_type == ID_NT) {
bNodeTree *group_ntree = (bNodeTree *)id;
build_nodetree(group_ntree);
ComponentKey group_output_key(&group_ntree->id, NodeType::NTREE_OUTPUT);