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 +19
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf3e9f2b3d - Show all commits

3
source/blender/functions/FN_lazy_function_graph_executor.hh
View File

@ -93,6 +93,9 @@ class GraphExecutor : public LazyFunction {
void *init_storage(LinearAllocator<> &allocator) const override;
void destruct_storage(void *storage) const override;
std::string input_name(int index) const override;
std::string output_name(int index) const override;
private:
void execute_impl(Params &params, const Context &context) const override;
};

16
source/blender/functions/intern/lazy_function_graph_executor.cc
View File

@ -1451,6 +1451,22 @@ void GraphExecutor::destruct_storage(void *storage) const
std::destroy_at(static_cast<Executor *>(storage));
}
std::string GraphExecutor::input_name(const int index) const
{
const lf::OutputSocket &socket = *graph_inputs_[index];
std::stringstream ss;
ss << socket.node().name() << " - " << socket.name();
return ss.str();
}
std::string GraphExecutor::output_name(const int index) const
{
const lf::InputSocket &socket = *graph_outputs_[index];
std::stringstream ss;
ss << socket.node().name() << " - " << socket.name();
return ss.str();
}
void GraphExecutorLogger::log_socket_value(const Socket &socket,
const GPointer value,
const Context &context) const