diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-06 21:34:56 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-06 21:34:56 +0400 |
| commit | decc2c2e774d11126d6006f9c4d4f37f2a09099d (patch) | |
| tree | 00dd7ffefd3cc720353c981248b5e442c8c39c10 /source/blender/blenkernel/intern/node.c | |
| parent | f2e236e312eb2e441e9869120165b316f0fddb44 (diff) | |
Node merge: fix crash loading files with unknown nodes (e.g. cycles files).
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index cd1a6e61151..47fc72f5e52 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1524,9 +1524,11 @@ void NodeTagChanged(bNodeTree *ntree, bNode *node) { 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); } |