[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39981] trunk/blender/source/blender: Node merge: fix crash loading files with unknown nodes (e.g.
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Sep 6 19:34:57 CEST 2011
Revision: 39981
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39981
Author: blendix
Date: 2011-09-06 17:34:56 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
Node merge: fix crash loading files with unknown nodes (e.g. cycles files).
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-06 17:28:26 UTC (rev 39980)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-06 17:34:56 UTC (rev 39981)
@@ -1524,9 +1524,11 @@
{
bNodeTreeType *ntreetype = ntreeGetType(ntree->type);
- if (ntreetype->update_node)
+ /* extra null pointer checks here because this is called when unlinking
+ unknown nodes on file load, so typeinfo pointers may not be set */
+ if (ntreetype && ntreetype->update_node)
ntreetype->update_node(ntree, node);
- else if (node->typeinfo->updatefunc)
+ else if (node->typeinfo && node->typeinfo->updatefunc)
node->typeinfo->updatefunc(ntree, node);
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-09-06 17:28:26 UTC (rev 39980)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-09-06 17:34:56 UTC (rev 39981)
@@ -2217,8 +2217,9 @@
if(node->type == NODE_DYNAMIC) {
node->custom1= 0;
node->custom1= BSET(node->custom1, NODE_DYNAMIC_LOADED);
- node->typeinfo= NULL;
}
+
+ node->typeinfo= NULL;
link_list(fd, &node->inputs);
link_list(fd, &node->outputs);
More information about the Bf-blender-cvs
mailing list