From 3676d6b88d0ab1aba140f533b83e7f05037b0a14 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 21 Sep 2022 15:01:52 -0500 Subject: Cleanup: Use const arguments for node group poll function Also make the disabled hint argument optional. --- source/blender/blenkernel/BKE_node.h | 4 ++-- source/blender/nodes/intern/node_common.cc | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 35d3fbf0b73..f504d5d1384 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -960,8 +960,8 @@ void nodeLabel(const struct bNodeTree *ntree, const struct bNode *node, char *la */ const char *nodeSocketLabel(const struct bNodeSocket *sock); -bool nodeGroupPoll(struct bNodeTree *nodetree, - struct bNodeTree *grouptree, +bool nodeGroupPoll(const struct bNodeTree *nodetree, + const struct bNodeTree *grouptree, const char **r_disabled_hint); /** diff --git a/source/blender/nodes/intern/node_common.cc b/source/blender/nodes/intern/node_common.cc index 6402ec3f3d6..1f085375329 100644 --- a/source/blender/nodes/intern/node_common.cc +++ b/source/blender/nodes/intern/node_common.cc @@ -82,7 +82,9 @@ bool node_group_poll_instance(bNode *node, bNodeTree *nodetree, const char **dis return false; } -bool nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree, const char **r_disabled_hint) +bool nodeGroupPoll(const bNodeTree *nodetree, + const bNodeTree *grouptree, + const char **r_disabled_hint) { bool valid = true; @@ -94,13 +96,16 @@ bool nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree, const char **r_dis } if (nodetree == grouptree) { - *r_disabled_hint = TIP_("Nesting a node group inside of itself is not allowed"); + if (r_disabled_hint) { + *r_disabled_hint = TIP_("Nesting a node group inside of itself is not allowed"); + } return false; } - LISTBASE_FOREACH (bNode *, node, &grouptree->nodes) { + LISTBASE_FOREACH (const bNode *, node, &grouptree->nodes) { if (node->typeinfo->poll_instance && - !node->typeinfo->poll_instance(node, nodetree, r_disabled_hint)) { + !node->typeinfo->poll_instance( + const_cast(node), const_cast(nodetree), r_disabled_hint)) { valid = false; break; } -- cgit v1.2.3