[Bf-blender-cvs] [a7918ea] master: Fix for typeinfo NULL pointer crash when initializing unknown node types.

Lukas Tönne noreply at git.blender.org
Mon May 12 15:42:02 CEST 2014


Commit: a7918ea40e4972b19e1f8441a249e93e969a7736
Author: Lukas Tönne
Date:   Mon May 12 15:33:20 2014 +0200
https://developer.blender.org/rBa7918ea40e4972b19e1f8441a249e93e969a7736

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.

===================================================================

M	source/blender/blenkernel/intern/node.c

===================================================================

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index ce1e34d..c11611a 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;
 	}




More information about the Bf-blender-cvs mailing list