diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-04 21:15:14 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-04 21:15:14 +0300 |
| commit | 1ae9960a15ddc9a0991715be25c31dbe56c0cb1a (patch) | |
| tree | 5472216f66d20be105fba3c3ef42aece826c4a51 /source/blender/editors/space_node/node_relationships.c | |
| parent | 304767dcd3459d222d8c6011e913840df74a6cd5 (diff) | |
| parent | 97be726f9319f9b5a3b076a62309549d73ea6aed (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors/space_node/node_relationships.c')
| -rw-r--r-- | source/blender/editors/space_node/node_relationships.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 0a4607d2869..9110d82fb84 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -251,6 +251,12 @@ static bNodeSocket *best_socket_output(bNodeTree *ntree, } } + /* Always allow linking to an reroute node. The socket type of the reroute sockets might change + * after the link has been created. */ + if (node->type == NODE_REROUTE) { + return node->outputs.first; + } + return NULL; } |