blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix #105778: Prevent invalid links with link swap #105809

Merged
Leon Schittek merged 2 commits from lone_noel/blender:fix-105778-invalid-link-swap into blender-v3.5-release 2023-03-16 21:39:43 +01:00
Conversation 0 Commits 2 Files Changed 1 +19 -6
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,18 +958,31 @@ static void node_swap_links(bNodeLinkDrag &nldrag, bNodeTree &ntree)
if (linked_socket.is_input()) {
LISTBASE_FOREACH (bNodeLink *, link, &ntree.links) {
if (link->tosock == &linked_socket) {
link->tosock = start_socket;
link->tonode = start_node;
if (link->tosock != &linked_socket) {
continue;
}
if (link->fromnode == start_node) {
/* Don't link a node to itself. */
nodeRemLink(&ntree, link);
continue;
}
link->tosock = start_socket;
link->tonode = start_node;
}
}
else {
LISTBASE_FOREACH (bNodeLink *, link, &ntree.links) {
if (link->fromsock == &linked_socket) {
link->fromsock = start_socket;
link->fromnode = start_node;
if (link->fromsock != &linked_socket) {
continue;
}
if (link->tonode == start_node) {
/* Don't link a node to itself. */
nodeRemLink(&ntree, link);
continue;
}
link->fromsock = start_socket;
link->fromnode = start_node;
}
}