kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Node merge: fix crash loading files with unknown nodes (e.g. cycles files).

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-09-06 17:34:56 +00:00
parent f2e236e312
commit decc2c2e77
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/node.c
View File

@ -1524,9 +1524,11 @@ void NodeTagChanged(bNodeTree *ntree, bNode *node)
{ {
bNodeTreeType *ntreetype = ntreeGetType(ntree->type); 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); ntreetype->update_node(ntree, node);
else if (node->typeinfo->updatefunc) else if (node->typeinfo && node->typeinfo->updatefunc)
node->typeinfo->updatefunc(ntree, node); node->typeinfo->updatefunc(ntree, node);
} }

3
source/blender/blenloader/intern/readfile.c
View File

@ -2217,8 +2217,9 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
if(node->type == NODE_DYNAMIC) { if(node->type == NODE_DYNAMIC) {
node->custom1= 0; node->custom1= 0;
node->custom1= BSET(node->custom1, NODE_DYNAMIC_LOADED); node->custom1= BSET(node->custom1, NODE_DYNAMIC_LOADED);
node->typeinfo= NULL;
} }
node->typeinfo= NULL;
link_list(fd, &node->inputs); link_list(fd, &node->inputs);
link_list(fd, &node->outputs); link_list(fd, &node->outputs);