[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55513] trunk/blender/source/blender/ blenkernel/intern/node.c: Added missing node-> id pointer checks in case node groups have unavailable node_tree data blocks .

Lukas Toenne lukas.toenne at googlemail.com
Fri Mar 22 16:46:38 CET 2013


Revision: 55513
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55513
Author:   lukastoenne
Date:     2013-03-22 15:46:38 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
Added missing node->id pointer checks in case node groups have unavailable node_tree data blocks.

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	2013-03-22 15:39:10 UTC (rev 55512)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-03-22 15:46:38 UTC (rev 55513)
@@ -1349,7 +1349,7 @@
 			BKE_node_preview_verify(previews, key, xsize, ysize, create);
 		}
 		
-		if (node->type == NODE_GROUP)
+		if (node->type == NODE_GROUP && node->id)
 			node_preview_init_tree_recursive(previews, (bNodeTree *)node->id, key, xsize, ysize, create);
 	}
 }
@@ -1374,7 +1374,7 @@
 		if (BKE_node_preview_used(node))
 			BKE_node_instance_hash_tag_key(previews, key);
 		
-		if (node->type == NODE_GROUP)
+		if (node->type == NODE_GROUP && node->id)
 			node_preview_tag_used_recursive(previews, (bNodeTree *)node->id, key);
 	}
 }




More information about the Bf-blender-cvs mailing list