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

Nodes: show warning when a group output is unused

Browse Source 
There are very rare use-cases for having multiple Group Output nodes. However,
it's something that's been supported for a long time and removing it may be a
regression for some. In practice, it's usually a mistake when someone has
multiple Group Output nodes.

This patch adds a simple warning on inactive Group Output nodes to help the user
notice this case.

Pull Request: https://projects.blender.org/blender/blender/pulls/138743
This commit is contained in:
Jacques Lucke
2025-05-12 16:13:57 +02:00
parent 542e7bb8e7
commit dd47ee9e25
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_node/node_draw.cc
View File

@@ -3070,7 +3070,7 @@ static Vector<NodeExtraInfoRow> node_get_extra_info(const bContext &C,
Vector<NodeExtraInfoRow> rows;
if (node.typeinfo->get_extra_info) {
nodes::NodeExtraInfoParams params{rows, node, C};
nodes::NodeExtraInfoParams params{rows, *snode.edittree, node, C};
node.typeinfo->get_extra_info(params);
}

1
source/blender/nodes/NOD_node_extra_info.hh
View File

@@ -22,6 +22,7 @@ struct NodeExtraInfoRow {
struct NodeExtraInfoParams {
Vector<NodeExtraInfoRow> &rows;
const bNodeTree &tree;
const bNode &node;
const bContext &C;
};

22
source/blender/nodes/intern/node_common.cc
View File

@@ -33,10 +33,14 @@
#include "NOD_common.hh"
#include "NOD_node_declaration.hh"
#include "NOD_node_extra_info.hh"
#include "NOD_register.hh"
#include "NOD_socket.hh"
#include "NOD_socket_declarations.hh"
#include "NOD_socket_declarations_geometry.hh"
#include "UI_resources.hh"
#include "node_common.h"
#include "node_util.hh"
@@ -875,6 +879,23 @@ bNodeSocket *node_group_output_find_socket(bNode *node, const StringRef identifi
return nullptr;
}
static void node_group_output_extra_info(blender::nodes::NodeExtraInfoParams &params)
{
const blender::Span<const bNode *> group_output_nodes = params.tree.nodes_by_type(
"NodeGroupOutput");
if (group_output_nodes.size() <= 1) {
return;
}
if (params.node.flag & NODE_DO_OUTPUT) {
return;
}
blender::nodes::NodeExtraInfoRow row;
row.text = IFACE_("Unused Output");
row.icon = ICON_ERROR;
row.tooltip = TIP_("There are multiple group output nodes and this one is not active");
params.rows.append(std::move(row));
}
void register_node_type_group_output()
{
/* used for all tree types, needs dynamic allocation */
@@ -889,6 +910,7 @@ void register_node_type_group_output()
blender::bke::node_type_size(*ntype, 140, 80, 400);
ntype->declare = blender::nodes::group_output_declare;
ntype->insert_link = blender::nodes::group_output_insert_link;
ntype->get_extra_info = node_group_output_extra_info;
ntype->no_muting = true;