[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48521] trunk/blender/source/blender/ blenkernel/intern: Check for nullpointers.

[Jeroen Bakker]

Revision: 48521
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48521
Author:   jbakker
Date:     2012-07-03 08:54:07 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Check for nullpointers.
The ID of group nodes are not always filled.

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

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-07-03 08:16:14 UTC (rev 48520)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-07-03 08:54:07 UTC (rev 48521)
@@ -366,7 +366,7 @@
 		if (n->id && GS(n->id->name) == ID_MA) {
 			dag_add_material_driver_relations(dag, node, (Material *)n->id);
 		}
-		else if (n->type == NODE_GROUP) {
+		else if (n->type == NODE_GROUP && n->id) {
 			dag_add_material_nodetree_driver_relations(dag, node, (bNodeTree *)n->id);
 		}
 	}

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2012-07-03 08:16:14 UTC (rev 48520)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2012-07-03 08:54:07 UTC (rev 48521)
@@ -1071,7 +1071,7 @@
 			/* TODO: prevent infinite recursion here... */
 			material_drivers_update(scene, (Material *)node->id, ctime);
 		}
-		else if (node->type == NODE_GROUP) {
+		else if (node->type == NODE_GROUP && node->id) {
 			material_node_drivers_update(scene, (bNodeTree *)node->id, ctime);
 		}
 	}