[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34181] trunk/blender/source/blender/ editors/space_node/node_edit.c: Bugfix #25525

[Ton Roosendaal]

Revision: 34181
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34181
Author:   ton
Date:     2011-01-08 19:12:42 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
Bugfix #25525

Duplicating viewer node crashed in cases; bad ID was given to a function.
Fix provided by Alexander Kuznetsov. Thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-08 18:46:21 UTC (rev 34180)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-08 19:12:42 UTC (rev 34181)
@@ -330,6 +330,7 @@
 	ntreeSolveOrder(tx->nodetree);	/* needed for pointers */
 }
 
+/* id is supposed to contain a node tree */
 void node_tree_from_ID(ID *id, bNodeTree **ntree, bNodeTree **edittree, int *treetype)
 {
 	bNode *node= NULL;
@@ -347,6 +348,10 @@
 		*ntree= ((Tex*)id)->nodetree;
 		if(treetype) *treetype= NTREE_TEXTURE;
 	}
+	else {
+		if(treetype) *treetype= 0;
+		return;
+	}
 
 	/* find editable group */
 	if(edittree) {
@@ -1521,7 +1526,7 @@
 	for(node= snode->edittree->nodes.first; node; node= node->next)
 		if(node->flag & SELECT)
 			if(node->id)
-				ED_node_changed_update(node->id, node);
+				ED_node_changed_update(snode->id, node);
 	
 	ntreeSolveOrder(snode->edittree);
 	node_tree_verify_groups(snode->nodetree);