[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51853] trunk/blender/source/blender/ blenkernel/intern/text.c: Fix for r51837.

Thomas Dinges blender at dingto.org
Sun Nov 4 02:32:42 CET 2012


Revision: 51853
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51853
Author:   dingto
Date:     2012-11-04 01:32:39 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Fix for r51837.
* mat->nodetree is accessed regardless of whether or not the material node is in use-

Patch provided by Tamito Kajiyama, thanks! 

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

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

Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c	2012-11-04 01:05:25 UTC (rev 51852)
+++ trunk/blender/source/blender/blenkernel/intern/text.c	2012-11-04 01:32:39 UTC (rev 51853)
@@ -591,6 +591,8 @@
 	/* nodes */
 	for (mat = bmain->mat.first; mat; mat = mat->id.next) {
 		ntree = mat->nodetree;
+		if (!ntree)
+			continue;
 		for (node = ntree->nodes.first; node; node = node->next) {
 			if (node->type == SH_NODE_SCRIPT) {
 				Text *ntext = (Text *)node->id;




More information about the Bf-blender-cvs mailing list