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:
authorLukas Toenne <lukas.toenne@googlemail.com>2013-03-22 19:46:38 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2013-03-22 19:46:38 +0400
commit750be44f31dadfd8159b16570e07f2853b0c48a5 (patch)
treeef4163c92405d9b7d15c2577214e78692c3c36aa /source/blender/blenkernel
parent25fc8b3d765657f61003709a31e6160a8105f146 (diff)
Added missing node->id pointer checks in case node groups have unavailable node_tree data blocks.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/node.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index ee3cd174291..788b185c6eb 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1349,7 +1349,7 @@ static void node_preview_init_tree_recursive(bNodeInstanceHash *previews, bNodeT
BKE_node_preview_verify(previews, key, xsize, ysize, create);
}
- if (node->type == NODE_GROUP)
+ if (node->type == NODE_GROUP && node->id)
node_preview_init_tree_recursive(previews, (bNodeTree *)node->id, key, xsize, ysize, create);
}
}
@@ -1374,7 +1374,7 @@ static void node_preview_tag_used_recursive(bNodeInstanceHash *previews, bNodeTr
if (BKE_node_preview_used(node))
BKE_node_instance_hash_tag_key(previews, key);
- if (node->type == NODE_GROUP)
+ if (node->type == NODE_GROUP && node->id)
node_preview_tag_used_recursive(previews, (bNodeTree *)node->id, key);
}
}