blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Geometry Nodes: make evaluation and logging system aware of zones #109029

Closed
Jacques Lucke wants to merge 93 commits from JacquesLucke/blender:zone-evaluation into main
pull from: JacquesLucke/blender:zone-evaluation
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 93 Files Changed 20 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1a78d27ffe - Show all commits

8
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
View File

@ -1508,7 +1508,9 @@ struct GeometryNodesLazyFunctionGraphBuilder {
this->find_zone_border_links();
for (const int zone_i : zone_build_order) {
this->build_zone_function(zone_i);
const TreeZone &zone = *tree_zones_->zones[zone_i];
BLI_assert(zone.output_node->type == GEO_NODE_SIMULATION_OUTPUT);
this->build_simulation_zone_function(zone);
}
}
@ -1549,9 +1551,9 @@ struct GeometryNodesLazyFunctionGraphBuilder {
}
}
void build_zone_function(const int zone_i)
void build_simulation_zone_function(const TreeZone &zone)
{
const TreeZone &zone = *tree_zones_->zones[zone_i];
const int zone_i = zone.index;
ZoneBuildInfo &zone_info = zone_build_infos_[zone_i];
zone_info.lf_graph = &lf_graph_info_->scope.construct<lf::Graph>();