Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-09-06 21:34:56 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-09-06 21:34:56 +0400
commitdecc2c2e774d11126d6006f9c4d4f37f2a09099d (patch)
tree00dd7ffefd3cc720353c981248b5e442c8c39c10 /source/blender/blenloader/intern
parentf2e236e312eb2e441e9869120165b316f0fddb44 (diff)
Node merge: fix crash loading files with unknown nodes (e.g. cycles files).
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d1a19f24b97..664148157cb 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2217,8 +2217,9 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
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);