[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31041] trunk/blender/source/blender/ blenkernel/intern/node.c: Fix #22869: procedural compositing buffers from texture nodes were not restored

[Brecht Van Lommel]

Revision: 31041
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31041
Author:   blendix
Date:     2010-08-04 17:51:52 +0200 (Wed, 04 Aug 2010)

Log Message:
-----------
Fix #22869: procedural compositing buffers from texture nodes were not restored
correct between localize/merge, bugfix for #21727 only did it one way.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2010-08-04 14:06:30 UTC (rev 31040)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2010-08-04 15:51:52 UTC (rev 31041)
@@ -2651,8 +2651,9 @@
 			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;
 				}
 			}
 		}