diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-03-18 23:19:26 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-03-18 23:19:26 +0400 |
commit | b2374f8de3723dae91459d9bcaa37fbd5914fd24 (patch) | |
tree | 16913c6cd874eb638471b577c50f3cd15e565304 /source/blender | |
parent | 66c7b54a889e292184dd386cf8cc2b0925e1d0f8 (diff) |
Node poll_instance callback is optional, check if it exists before executing.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_node/node_group.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index f460c68638f..10f9718f1b6 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -662,7 +662,7 @@ static bool node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const /* check poll functions for selected nodes */ for (node = ntree->nodes.first; node; node = node->next) { if (node_group_make_use_node(node, gnode)) { - if (!node->typeinfo->poll_instance(node, ngroup)) { + if (node->typeinfo->poll_instance && !node->typeinfo->poll_instance(node, ngroup)) { BKE_reportf(reports, RPT_WARNING, "Can not add node '%s' in a group", node->name); ok = false; break; diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index 92789eef816..54ffd3cd01c 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -105,7 +105,7 @@ int nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree) return 0; for (node=grouptree->nodes.first; node; node=node->next) { - if (!node->typeinfo->poll_instance(node, nodetree)) { + if (node->typeinfo->poll_instance && !node->typeinfo->poll_instance(node, nodetree)) { valid = 0; break; } |