[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57963] trunk/blender/source/blender/ blenkernel/intern/node.c: Fix crash when getting active ID from a node tree with missing groups

Sergey Sharybin sergey.vfx at gmail.com
Wed Jul 3 17:33:12 CEST 2013


Revision: 57963
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57963
Author:   nazgul
Date:     2013-07-03 15:33:11 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Fix crash when getting active ID from a node tree with missing groups

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-07-03 12:38:30 UTC (rev 57962)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-07-03 15:33:11 UTC (rev 57963)
@@ -2301,10 +2301,12 @@
 		for (node = ntree->nodes.first; node; node = node->next) {
 			if (node->type == NODE_GROUP) {
 				bNodeTree *group = (bNodeTree *)node->id;
-				bNodeInstanceKey group_key = BKE_node_instance_key(parent_key, ntree, node);
-				tnode = node_get_active_id_recursive(active_key, group_key, group, idtype);
-				if (tnode)
-					return tnode;
+				if (group) {
+					bNodeInstanceKey group_key = BKE_node_instance_key(parent_key, ntree, node);
+					tnode = node_get_active_id_recursive(active_key, group_key, group, idtype);
+					if (tnode)
+						return tnode;
+				}
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list