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

Geometry Nodes: put closure sockets in panel

Browse Source 
This moves the closure interface sockets into a separate panel so that they
can't be confused with the main closure input.

Pull Request: https://projects.blender.org/blender/blender/pulls/143821
This commit is contained in:
Jacques Lucke
2025-08-04 18:35:20 +02:00
parent 793040ad1c
commit 72e810a45a
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/nodes/geometry/nodes/node_geo_evaluate_closure.cc
View File

@@ -24,31 +24,34 @@ NODE_STORAGE_FUNCS(NodeEvaluateClosure)
static void node_declare(NodeDeclarationBuilder &b)
{
b.use_custom_socket_order();
b.allow_any_socket_order();
b.add_input<decl::Closure>("Closure");
const bNode *node = b.node_or_null();
auto &panel = b.add_panel("Interface");
if (node) {
const auto &storage = node_storage(*node);
for (const int i : IndexRange(storage.input_items.items_num)) {
const NodeEvaluateClosureInputItem &item = storage.input_items.items[i];
const eNodeSocketDatatype socket_type = eNodeSocketDatatype(item.socket_type);
const std::string identifier = EvaluateClosureInputItemsAccessor::socket_identifier_for_item(
item);
b.add_input(socket_type, item.name, identifier)
.structure_type(StructureType(item.structure_type));
}
for (const int i : IndexRange(storage.output_items.items_num)) {
const NodeEvaluateClosureOutputItem &item = storage.output_items.items[i];
const eNodeSocketDatatype socket_type = eNodeSocketDatatype(item.socket_type);
const std::string identifier =
EvaluateClosureOutputItemsAccessor::socket_identifier_for_item(item);
b.add_output(socket_type, item.name, identifier)
panel.add_output(socket_type, item.name, identifier)
.structure_type(StructureType(item.structure_type));
}
panel.add_output<decl::Extend>("", "__extend__");
for (const int i : IndexRange(storage.input_items.items_num)) {
const NodeEvaluateClosureInputItem &item = storage.input_items.items[i];
const eNodeSocketDatatype socket_type = eNodeSocketDatatype(item.socket_type);
const std::string identifier = EvaluateClosureInputItemsAccessor::socket_identifier_for_item(
item);
panel.add_input(socket_type, item.name, identifier)
.structure_type(StructureType(item.structure_type));
}
panel.add_input<decl::Extend>("", "__extend__");
}
b.add_input<decl::Extend>("", "__extend__");
b.add_output<decl::Extend>("", "__extend__");
}
static void node_init(bNodeTree * /*tree*/, bNode *node)