diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 20:32:51 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 20:32:51 +0300 |
| commit | 88e45b8c99c640506b88a7529b504378a2b51f32 (patch) | |
| tree | 844aa6cd7cc2f894942de610809e3137ec62519e /source/blender/nodes | |
| parent | aa175e003386fa68f7aa24a1c947e5b6ad999f6a (diff) | |
| parent | db03be60ec227f42bb930e9118d2ecb5f4ebbb43 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/intern/node_socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index 23ba51bbe10..fad57cc410a 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -115,8 +115,7 @@ static bNodeSocket *verify_socket_template(bNodeTree *ntree, bNode *node, int in if (sock->type != stemp->type) { nodeModifySocketType(ntree, node, sock, stemp->type, stemp->subtype); } - - sock->limit = (stemp->limit == 0 ? 0xFFF : stemp->limit); + sock->limit = (stemp->limit == 0 ? (in_out == SOCK_IN ? 1 : 0xFFF) : stemp->limit); sock->flag |= stemp->flag; } else { |