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

Fix: merge conflict after rename

Browse Source 
Caused by e8877df863.
This commit is contained in:
Jacques Lucke
2025-04-14 17:46:44 +02:00
parent 6655c6fa75
commit 8a52e0d104
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/nodes/intern/geometry_nodes_closure_zone.cc
View File

@@ -669,8 +669,8 @@ class LazyFunctionForEvaluateClosureNode : public LazyFunction {
}
}
const CPPType &cpp_type = *output_type.geometry_nodes_cpp_type;
void *default_output_value = eval_storage.scope.linear_allocator().allocate(
cpp_type.size(), cpp_type.alignment());
void *default_output_value = eval_storage.scope.allocator().allocate(cpp_type.size(),
cpp_type.alignment());
construct_socket_default_value(output_type, default_output_value);
lf_main_output.set_default_value(default_output_value);
if (!cpp_type.is_trivially_destructible()) {
@@ -690,7 +690,7 @@ class LazyFunctionForEvaluateClosureNode : public LazyFunction {
lf_graph.update_node_indices();
eval_storage.graph_executor.emplace(lf_graph, nullptr, nullptr, nullptr);
eval_storage.graph_executor_storage = eval_storage.graph_executor->init_storage(
eval_storage.scope.linear_allocator());
eval_storage.scope.allocator());
}
};