Page MenuHome
Differential D11570

Fix T88807: Multiple links from same socket.
ClosedPublic
Actions

Authored by Jacques Lucke (JacquesLucke) on Jun 10 2021, 4:59 PM.

Details

Reviewers
Hans Goudey (HooglyBoogly)
Fabian Schempp (fabian_schempp)
Maniphest Tasks
T88807: Node Wrangler: Lazy connect to Multi-input multiple times duplicates noodle
Commits
rB1fa73076ca26: Fix T88807: crash when there are multiple links between the same sockets
rB03544ed54f8d: Fix T88807: crash when there are multiple links between the same sockets
Summary

This patch does two things:

  1. Disallows creating more than one link from one socket to a multi socket input.
  2. Properly count links if there happen to be more than one link between the same sockets.

The new link counting should also be more efficient asymptotically.

Diff Detail

Repository
rB Blender
Branch
fix-multi-input-from-same-socket (branched from master)
Build Status
Buildable 15108
Build 15108: arc lint + arc unit

Event Timeline

Jacques Lucke (JacquesLucke) requested review of this revision.Jun 10 2021, 4:59 PM
Jacques Lucke (JacquesLucke) created this revision.
Harbormaster completed remote builds in B15108: Diff 38156.Jun 10 2021, 4:59 PM
Jacques Lucke (JacquesLucke) retitled this revision from Nodes: Fix multiple links from same socket. to Fix T88807: Multiple links from same socket..Jun 10 2021, 5:01 PM
Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)
Jacques Lucke (JacquesLucke) added a task: T88807: Node Wrangler: Lazy connect to Multi-input multiple times duplicates noodle.
Jacques Lucke (JacquesLucke) added reviewers: Hans Goudey (HooglyBoogly), Fabian Schempp (fabian_schempp).
Hans Goudey (HooglyBoogly) accepted this revision.Jun 10 2021, 5:50 PM
Hans Goudey (HooglyBoogly) added inline comments.
source/blender/editors/space_node/node_draw.cc
1780

No need to remove this comment IMO, it's helpful for understanding why there are two loops, at least if someone isn't already familiar with the code.

This revision is now accepted and ready to land.Jun 10 2021, 5:50 PM
Closed by commit rB03544ed54f8d: Fix T88807: crash when there are multiple links between the same sockets (authored by Jacques Lucke (JacquesLucke)). · Explain WhyJun 14 2021, 10:06 AM
This revision was automatically updated to reflect the committed changes.
Jacques Lucke (JacquesLucke) added a commit: rB03544ed54f8d: Fix T88807: crash when there are multiple links between the same sockets.
Wannes Malfait (Wannes) mentioned this in T89416: NodeTree.links.new() can connect one output to a multi-input many times; access violation occurs when disconnecting.Jun 25 2021, 10:54 AM
Jeroen Bakker (jbakker) added a commit: rB1fa73076ca26: Fix T88807: crash when there are multiple links between the same sockets.Aug 9 2021, 8:43 AM

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
space_node/
37 lines
makesrna/
intern/
7 lines

Diff 38156

View Options

source/blender/editors/space_node/node_draw.cc

Loading...
View Options

source/blender/makesrna/intern/rna_nodetree.c

Loading...