[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27888] trunk/blender/source/blender: Fix [#21727] texture in compositor quickly results in crash

[Matt Ebb]

Revision: 27888
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27888
Author:   broken
Date:     2010-03-31 07:44:21 +0200 (Wed, 31 Mar 2010)

Log Message:
-----------
Fix [#21727] texture in compositor quickly results in crash

Hopefully this is correct - looks like the CompBuf->node pointer was getting left
out of the per-thread copying/localisation.

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

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2010-03-31 02:21:32 UTC (rev 27887)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2010-03-31 05:44:21 UTC (rev 27888)
@@ -2573,6 +2573,8 @@
 		for(sock= node->outputs.first; sock; sock= sock->next) {
 			
 			sock->new_sock->ns.data= sock->ns.data;
+			compbuf_set_node(sock->new_sock->ns.data, node->new_node);
+			
 			sock->ns.data= NULL;
 			sock->new_sock->new_sock= sock;
 		}

Modified: trunk/blender/source/blender/nodes/intern/CMP_util.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_util.c	2010-03-31 02:21:32 UTC (rev 27887)
+++ trunk/blender/source/blender/nodes/intern/CMP_util.c	2010-03-31 05:44:21 UTC (rev 27888)
@@ -122,6 +122,11 @@
 	
 }
 
+void compbuf_set_node(CompBuf *cbuf, bNode *node)
+{
+	if (cbuf) cbuf->node = node;
+}
+
 /* used for disabling node  (similar code in drawnode.c for disable line) */
 void node_compo_pass_on(bNode *node, bNodeStack **nsin, bNodeStack **nsout)
 {

Modified: trunk/blender/source/blender/nodes/intern/CMP_util.h
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_util.h	2010-03-31 02:21:32 UTC (rev 27887)
+++ trunk/blender/source/blender/nodes/intern/CMP_util.h	2010-03-31 05:44:21 UTC (rev 27888)
@@ -110,6 +110,7 @@
 CompBuf *pass_on_compbuf(CompBuf *cbuf);
 void free_compbuf(CompBuf *cbuf);
 void print_compbuf(char *str, CompBuf *cbuf);
+void compbuf_set_node(struct CompBuf *cbuf, struct bNode *node);
 void node_compo_pass_on(struct bNode *node, struct bNodeStack **nsin, struct bNodeStack **nsout);
 
 CompBuf *get_cropped_compbuf(rcti *drect, float *rectf, int rectx, int recty, int type);