Fix #108336: Treat node sockets with muted links as linked #108375

Leon Schittek · 2023-05-28T16:04:03+02:00

Leon Schittek commented

2023-05-28 16:04:03 +02:00

Prevent make links operator from creating links to sockets that are
already linked to a muted link.

The SOCK_IS_LINKED flag is used to check if there already is a link
connecting to the socket but when the link is muted, the flag wasn't set
leading to issues in parts of the code that used the flag to check
for any type of connected link.
This commit now also sets SOCK_IS_LINKED when links are muted and
adds an additional check in places where different behavior is expected
for muted links.

Issue
When links are muted, the SOCK_IS_LINKED flag hasn't been set to allow
treating the socket as unconnected (e.g. to expose the value buttons).
Some problems came up, because most parts of the code use the
SOCK_IS_LINKED flag as a check if there is already a link connecting
to the socket - even if that link is muted:

The "Make Links" operator links to sockets even though they are
already connected with a muted link, creating duplicate links.
Setting the hide property of a socket through the Python API will
hide a socket, when the connecting link is muted. (Using the
hide_socket_toggle operator doesn't do this since it uses a
different check, that also checks for muted links)
There seems to be some cycles versioning code that only runs if the
socket is not linked (checked via the SOCK_IS_LINKED flag) which
could potentially run for linked sockets, if their links are muted.

You can test (1.) and (2.) with the attached .blend file. Just opening and
press F to test (1.) or run the script in the text editor for (2.)

Prevent make links operator from creating links to sockets that are already linked to a muted link. The `SOCK_IS_LINKED` flag is used to check if there already is a link connecting to the socket but when the link is muted, the flag wasn't set leading to issues in parts of the code that used the flag to check for any type of connected link. This commit now also sets `SOCK_IS_LINKED` when links are muted and adds an additional check in places where different behavior is expected for muted links. --- **Issue** When links are muted, the `SOCK_IS_LINKED` flag hasn't been set to allow treating the socket as unconnected (e.g. to expose the value buttons). Some problems came up, because most parts of the code use the `SOCK_IS_LINKED` flag as a check if there is already a link connecting to the socket - even if that link is muted: 1. The "Make Links" operator links to sockets even though they are already connected with a muted link, creating duplicate links. 2. Setting the `hide` property of a socket through the Python API will hide a socket, when the connecting link is muted. (Using the `hide_socket_toggle` operator doesn't do this since it uses a different check, that also checks for muted links) 3. There seems to be some cycles versioning code that only runs if the socket is not linked (checked via the `SOCK_IS_LINKED` flag) which could potentially run for linked sockets, if their links are muted. You can test (1.) and (2.) with the attached .blend file. Just opening and press `F` to test (1.) or run the script in the text editor for (2.)

issue-108336.blend

868 KiB

👍 1

Leon Schittek added the

Module

Nodes & Physics

label 2023-05-28 16:04:03 +02:00

Leon Schittek added 1 commit 2023-05-28 16:04:10 +02:00

7faf56a98a Fix #108336 : Treat node sockets with muted links as connected

Prevent make links operator from connecting to sockets that are already
linked to a muted link.

The `SOCK_IS_LINKED` flag is used to check if there already is a link
connecting to the socket but when the link is muted, the flag wasn't set
leading to issues in parts of the code that used the flag to check
for any type of connected link.
This commit now also sets `SOCK_IS_LINKED` when links are muted and
adds an additional check in places where different behavior is expected
for muted links.

Leon Schittek added this to the Nodes & Physics project 2023-05-28 16:08:28 +02:00

Hans Goudey approved these changes 2023-05-31 22:33:50 +02:00

Hans Goudey left a comment

Definitely makes sense! Though long term the SOCK_IS_LINKED flag itself is redundant-- as we progress with the topology cache it could hopefully be removed.

Definitely makes sense! Though long term the `SOCK_IS_LINKED` flag itself is redundant-- as we progress with the topology cache it could hopefully be removed.

Leon Schittek merged commit 2ce5fc4a3e into blender-v3.6-release

2023-06-03 12:35:04 +02:00

Leon Schittek referenced this issue from a commit

2023-06-03 12:35:05 +02:00

Fix #108336: Treat node sockets with muted links as linked

Leon Schittek deleted branch fix-108336-make-links-duplicates-muted-links

2023-06-03 12:35:07 +02:00

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix #108336: Treat node sockets with muted links as linked #108375