diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-04 19:51:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-04 19:51:52 +0400 |
| commit | 3840b0c206d02d32a221cb0d53b3339eb73ecb57 (patch) | |
| tree | b2fdfd02894d32bc435c2000329d61eedc64d92d /source/blender/blenkernel/intern/node.c | |
| parent | 4906290f0d3c8e5de91fad104e363a090f6a89f5 (diff) | |
Fix #22869: procedural compositing buffers from texture nodes were not restored
correct between localize/merge, bugfix for #21727 only did it one way.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index ff1887b0883..2a4713ee25c 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -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; } } } |