diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-03 19:33:11 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-03 19:33:11 +0400 |
| commit | 9b726219582f0344f2bdb1e4b4d2c014795a9c72 (patch) | |
| tree | 9b680ef67345ddc6abe1e496058a00360279d58d /source/blender/blenkernel/intern/node.c | |
| parent | d07f060206353627b52b0fe3e22c9a8889d48149 (diff) | |
Fix crash when getting active ID from a node tree with missing groups
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index ee8edfe32ae..8488fa63e21 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2301,10 +2301,12 @@ static bNode *node_get_active_id_recursive(bNodeInstanceKey active_key, bNodeIns for (node = ntree->nodes.first; node; node = node->next) { if (node->type == NODE_GROUP) { bNodeTree *group = (bNodeTree *)node->id; - bNodeInstanceKey group_key = BKE_node_instance_key(parent_key, ntree, node); - tnode = node_get_active_id_recursive(active_key, group_key, group, idtype); - if (tnode) - return tnode; + if (group) { + bNodeInstanceKey group_key = BKE_node_instance_key(parent_key, ntree, node); + tnode = node_get_active_id_recursive(active_key, group_key, group, idtype); + if (tnode) + return tnode; + } } } } |