Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-05-02 00:10:45 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-02 00:10:45 +0300
commit447a7f510ed7a11af77449ad69a68b15188d6da7 (patch)
tree14d15879963f446780815228fa409ae9d9d41166
parent433eaffd55a5815dfae31a07747f358bda162aed (diff)
Fix T76309: changing AOV type does not update compositor socket
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_image.c6
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) {