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:
Diffstat (limited to 'source/blender/nodes/intern/node_common.c')
-rw-r--r--source/blender/nodes/intern/node_common.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 4e4443f7c3f..24f35cc81af 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -89,11 +89,15 @@ const char *node_group_label(bNode *node)
int node_group_poll_instance(bNode *node, bNodeTree *nodetree)
{
- bNodeTree *grouptree = (bNodeTree*)node->id;
- if (grouptree)
- return nodeGroupPoll(nodetree, grouptree);
+ if (node->typeinfo->poll(node->typeinfo, nodetree)) {
+ bNodeTree *grouptree = (bNodeTree*)node->id;
+ if (grouptree)
+ return nodeGroupPoll(nodetree, grouptree);
+ else
+ return TRUE; /* without a linked node tree, group node is always ok */
+ }
else
- return 1;
+ return FALSE;
}
int nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree)