[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51861] trunk/blender/source/blender/ blenkernel/intern/node.c: Bugfix 33075

[Ton Roosendaal]

Revision: 51861
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51861
Author:   ton
Date:     2012-11-04 11:53:13 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Bugfix 33075

Nodes could use duplicated memory - and on free you get duplicate-free errors.
Affected texture nodes, but I suspect compositing too.

Fix found by Philipp Oeser. Thanks!

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	2012-11-04 10:20:16 UTC (rev 51860)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2012-11-04 11:53:13 UTC (rev 51861)
@@ -405,10 +405,14 @@
 	nnode->new_node = NULL;
 	
 	/* only shader nodes get pleasant preview updating this way, compo uses own system */
-	if (node->preview && ntree->type == NTREE_SHADER) {
-		nnode->preview = MEM_dupallocN(node->preview);
-		if (node->preview->rect)
-			nnode->preview->rect = MEM_dupallocN(node->preview->rect);
+	if (node->preview) {
+		if (ntree->type == NTREE_SHADER) {
+			nnode->preview = MEM_dupallocN(node->preview);
+			if (node->preview->rect)
+				nnode->preview->rect = MEM_dupallocN(node->preview->rect);
+		}
+		else 
+			nnode->preview = NULL;
 	}
 	
 	if (ntree)