Fix #22869: procedural compositing buffers from texture nodes were not restored

correct between localize/merge, bugfix for #21727 only did it one way.
This commit is contained in:
2010-08-04 15:51:52 +00:00
parent 4906290f0d
commit 3840b0c206

View File

@@ -2651,8 +2651,9 @@ void ntreeLocalMerge(bNodeTree *localtree, bNodeTree *ntree)
for(lsock= lnode->outputs.first; lsock; lsock= lsock->next) {
if(outsocket_exists(lnode->new_node, lsock->new_sock)) {
lsock->new_sock->ns.data= lsock->ns.data;
compbuf_set_node(lsock->new_sock->ns.data, lnode->new_node);
lsock->ns.data= NULL;
lsock->new_sock= NULL;
lsock->new_sock= NULL;
}
}
}