diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-07-04 02:12:42 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-07-04 02:12:42 +0400 |
| commit | e7fc69bdfd06f9fda7ddbcf53f26fee0b81abf8d (patch) | |
| tree | 1b2c2ed06269d15be21188e828b7310ee7488730 /source/blender/blenkernel/intern/node.c | |
| parent | 3a6e382d4aef6ad4bcba8a482d6d5fb5f96a6618 (diff) | |
| parent | 374383997cc2dc36819eb0ec125d6a2d06809f71 (diff) | |
Merged revision(s) 57908-57978 from trunk/blender into soc-2013-dingto.
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 170b4156b21..fbb0132965a 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; + } } } } |