archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #105397: Support cycling through sockets after a geometry output is linked.

Browse Source 
The `NODE_OT_link_viewer` operator has some complicated logic that was
intended to stop cycling through geometry nodes to make it work better
with nodes that have multiple geometry and data outputs (group nodes).
This logic failed when geometry was not the first socket and it would
just stop connecting data sockets altogether after the geometry socket.

The reason is that the `determine_socket_to_view` function stops looking
for already-viewed outputs after the first geometry, and then simply
reconnects that geometry.

This patch changes the behavior slightly so that, if a geometry output
is found, the node skips over all subsequent geometry outputs, but still
considers data sockets for viewing. Viewing a node with multiple geometry
outputs will connect the first geometry output it encounters and then
keep cycling through data outputs on repeated execution.

Pull Request: #105836
This commit is contained in:
Lukas Tönne
2023-03-16 16:49:56 +01:00
parent de49d18af5
commit 3962d9b931
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_node/node_relationships.cc
View File

@@ -525,6 +525,7 @@ static void remove_links_to_unavailable_viewer_sockets(bNodeTree &btree, bNode &
static bNodeSocket *determine_socket_to_view(bNode &node_to_view)
{
int last_linked_socket_index = -1;
bool has_linked_geometry_socket = false;
for (bNodeSocket *socket : node_to_view.output_sockets()) {
if (!socket_can_be_viewed(*socket)) {
continue;
@@ -537,10 +538,8 @@ static bNodeSocket *determine_socket_to_view(bNode &node_to_view)
/* This socket is linked to a deactivated viewer, the viewer should be activated. */
return socket;
}
if (socket->type == SOCK_GEOMETRY && (target_node.flag & NODE_DO_OUTPUT)) {
/* Skip geometry sockets connected to viewer nodes when deciding whether to cycle through
* outputs. */
continue;
if (socket->type == SOCK_GEOMETRY) {
has_linked_geometry_socket = true;
}
last_linked_socket_index = socket->index();
}
@@ -565,6 +564,11 @@ static bNodeSocket *determine_socket_to_view(bNode &node_to_view)
if (!socket_can_be_viewed(output_socket)) {
continue;
}
if (has_linked_geometry_socket && output_socket.type == SOCK_GEOMETRY) {
/* Skip geometry sockets when cycling if one is already viewed. */
continue;
}
bool is_currently_viewed = false;
for (const bNodeLink *link : output_socket.directly_linked_links()) {
bNodeSocket &target_socket = *link->tosock;