diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-02 00:55:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-02 00:55:13 +0300 |
| commit | 83304e4c221b646d38387930d21011995427a05a (patch) | |
| tree | d555f30369771a44ea6c54d8f379c035eacfc5b3 /source/blender/nodes | |
| parent | 7212dbd7be8d69f1fea5c918d820796641197417 (diff) | |
| parent | bba11c68c40480f525a23784ebca81d98e2ec6d2 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 10de192277b..382459993b7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -86,6 +86,12 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, { bNodeSocket *sock = BLI_findstring(&node->outputs, name, offsetof(bNodeSocket, name)); + /* Replace if types don't match. */ + if (sock && sock->type != type) { + nodeRemoveSocket(ntree, node, sock); + sock = NULL; + } + /* Create socket if it doesn't exist yet. */ if (sock == NULL) { if (rres_index >= 0) { |