[Bf-blender-cvs] [f354aebc6f3] functions-experimental-refactor: cleanup name access

[Jacques Lucke]

Commit: f354aebc6f340f20d32a85f55f7e3afa2c945a5f
Author: Jacques Lucke
Date:   Fri Nov 1 14:35:44 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rBf354aebc6f340f20d32a85f55f7e3afa2c945a5f

cleanup name access

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

M	source/blender/blenkernel/BKE_multi_function_network.h

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

diff --git a/source/blender/blenkernel/BKE_multi_function_network.h b/source/blender/blenkernel/BKE_multi_function_network.h
index 998a62104b6..a7e1069fff2 100644
--- a/source/blender/blenkernel/BKE_multi_function_network.h
+++ b/source/blender/blenkernel/BKE_multi_function_network.h
@@ -40,7 +40,7 @@ class MFBuilderNode : BLI::NonCopyable, BLI::NonMovable {
   ArrayRef<MFBuilderInputSocket *> inputs();
   ArrayRef<MFBuilderOutputSocket *> outputs();
 
-  StringRef name();
+  StringRefNull name();
 
   uint id();
 
@@ -85,7 +85,7 @@ class MFBuilderSocket : BLI::NonCopyable, BLI::NonMovable {
 
   uint index();
   uint id();
-  StringRef name();
+  StringRefNull name();
 
   bool is_input();
   bool is_output();
@@ -194,6 +194,8 @@ class MFNode : BLI::NonCopyable, BLI::NonMovable {
  public:
   const MFNetwork &network() const;
 
+  StringRefNull name() const;
+
   ArrayRef<const MFInputSocket *> inputs() const;
   ArrayRef<const MFOutputSocket *> outputs() const;
 
@@ -311,7 +313,7 @@ inline uint MFBuilderNode::id()
   return m_id;
 }
 
-inline StringRef MFBuilderNode::name()
+inline StringRefNull MFBuilderNode::name()
 {
   if (this->is_function()) {
     return this->as_function().function().name();
@@ -377,7 +379,7 @@ inline uint MFBuilderSocket::id()
   return m_id;
 }
 
-inline StringRef MFBuilderSocket::name()
+inline StringRefNull MFBuilderSocket::name()
 {
   if (m_node->is_function()) {
     MFBuilderFunctionNode &node = m_node->as_function();
@@ -446,6 +448,16 @@ inline uint MFNode::id() const
   return m_id;
 }
 
+inline StringRefNull MFNode::name() const
+{
+  if (this->is_function()) {
+    return this->as_function().function().name();
+  }
+  else {
+    return "Dummy";
+  }
+}
+
 inline bool MFNode::is_function() const
 {
   return !m_is_dummy;