[Bf-blender-cvs] [dd1a90353be] node-tree-ref: rename

[Jacques Lucke]

Commit: dd1a90353be9870fa37f10a379a197e6eeab982e
Author: Jacques Lucke
Date:   Tue May 5 14:35:27 2020 +0200
Branches: node-tree-ref
https://developer.blender.org/rBdd1a90353be9870fa37f10a379a197e6eeab982e

rename

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

M	source/blender/blenkernel/BKE_node_tree_ref.hh
M	source/blender/blenkernel/intern/node_tree_ref.cc

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

diff --git a/source/blender/blenkernel/BKE_node_tree_ref.hh b/source/blender/blenkernel/BKE_node_tree_ref.hh
index 46728e0119c..d9a9232906d 100644
--- a/source/blender/blenkernel/BKE_node_tree_ref.hh
+++ b/source/blender/blenkernel/BKE_node_tree_ref.hh
@@ -128,7 +128,8 @@ class NodeRef : BLI::NonCopyable, BLI::NonMovable {
 
   uint id() const;
 
-  bool is_reroute() const;
+  bool is_reroute_node() const;
+  bool is_group_node() const;
 };
 
 class NodeTreeRef : BLI::NonCopyable, BLI::NonMovable {
@@ -350,11 +351,16 @@ inline uint NodeRef::id() const
   return m_id;
 }
 
-inline bool NodeRef::is_reroute() const
+inline bool NodeRef::is_reroute_node() const
 {
   return m_bnode->type == NODE_REROUTE;
 }
 
+inline bool NodeRef::is_group_node() const
+{
+  return m_bnode->type == NODE_GROUP;
+}
+
 /* --------------------------------------------------------------------
  * NodeRef inline methods.
  */
diff --git a/source/blender/blenkernel/intern/node_tree_ref.cc b/source/blender/blenkernel/intern/node_tree_ref.cc
index 84878801cef..2d55540e477 100644
--- a/source/blender/blenkernel/intern/node_tree_ref.cc
+++ b/source/blender/blenkernel/intern/node_tree_ref.cc
@@ -69,7 +69,7 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree)
   }
 
   for (OutputSocketRef *socket : m_output_sockets) {
-    if (!socket->m_node->is_reroute()) {
+    if (!socket->m_node->is_reroute_node()) {
       this->find_targets_skipping_reroutes(*socket, socket->m_linked_sockets);
       for (SocketRef *target : socket->m_linked_sockets) {
         target->m_linked_sockets.append(socket);
@@ -127,7 +127,7 @@ void NodeTreeRef::find_targets_skipping_reroutes(OutputSocketRef &socket,
                                                  Vector<SocketRef *> &r_targets)
 {
   for (SocketRef *direct_target : socket.m_directly_linked_sockets) {
-    if (direct_target->m_node->is_reroute()) {
+    if (direct_target->m_node->is_reroute_node()) {
       this->find_targets_skipping_reroutes(*direct_target->m_node->m_outputs[0], r_targets);
     }
     else {