diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-12 17:33:20 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-12 17:35:49 +0400 |
commit | a7918ea40e4972b19e1f8441a249e93e969a7736 (patch) | |
tree | fb8c5e017a94a7519be43f0d04ac0415fecbbeab /source/blender/blenkernel/intern/node.c | |
parent | 146a1c77eacb925eb7c86bb49495c0f09adc607c (diff) |
Fix for typeinfo NULL pointer crash when initializing unknown node types.
Noticed by @bdancer on IRC. Happens e.g. when loading a file with
pynodes which haven't been registered yet.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index ce1e34de0b0..c11611a1f65 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -174,7 +174,7 @@ static void node_set_typeinfo(const struct bContext *C, bNodeTree *ntree, bNode { /* for nodes saved in older versions storage can get lost, make undefined then */ if (node->flag & NODE_INIT) { - if (typeinfo->storagename[0] && !node->storage) + if (typeinfo && typeinfo->storagename[0] && !node->storage) typeinfo = NULL; } |