[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56161] trunk/blender/source/blender/ blenkernel/intern/node.c: Fix for bug reported by Dalai Felinto on IRC, crash in blenderplayer after r56055.

[Lukas Toenne]

Revision: 56161
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56161
Author:   lukastoenne
Date:     2013-04-19 06:50:07 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Fix for bug reported by Dalai Felinto on IRC, crash in blenderplayer after r56055. The ntreeUpdateTree function uses G.main, which is not defined in blenderplayer (NULL). Using G.main is in itself an ugly hack required for the node verification. Just added a sanity check for now.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56055

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-04-19 02:47:31 UTC (rev 56160)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-04-19 06:50:07 UTC (rev 56161)
@@ -2885,7 +2885,8 @@
 		ntreeInterfaceTypeUpdate(ntree);
 	
 	/* XXX hack, should be done by depsgraph!! */
-	ntreeVerifyNodes(G.main, &ntree->id);
+	if (G.main)
+		ntreeVerifyNodes(G.main, &ntree->id);
 	
 	if (ntree->update & (NTREE_UPDATE_LINKS | NTREE_UPDATE_NODES)) {
 		/* node updates can change sockets or links, repeat link pointer update afterward */