[Bf-blender-cvs] [3676d6b88d0] master: Cleanup: Use const arguments for node group poll function

[Hans Goudey]

Commit: 3676d6b88d0ab1aba140f533b83e7f05037b0a14
Author: Hans Goudey
Date:   Wed Sep 21 15:01:52 2022 -0500
Branches: master
https://developer.blender.org/rB3676d6b88d0ab1aba140f533b83e7f05037b0a14

Cleanup: Use const arguments for node group poll function

Also make the disabled hint argument optional.

===================================================================

M	source/blender/blenkernel/BKE_node.h
M	source/blender/nodes/intern/node_common.cc

===================================================================

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<bNode *>(node), const_cast<bNodeTree *>(nodetree), r_disabled_hint)) {
       valid = false;
       break;
     }