[Bf-blender-cvs] [5420375d4a2] functions: return StringRef from virtual node/socket

[Jacques Lucke]

Commit: 5420375d4a284abb5ad989a2dd3c636c77eb029b
Author: Jacques Lucke
Date:   Thu Sep 5 12:36:45 2019 +0200
Branches: functions
https://developer.blender.org/rB5420375d4a284abb5ad989a2dd3c636c77eb029b

return StringRef from virtual node/socket

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

M	source/blender/blenkernel/BKE_node_tree.hpp
M	source/blender/functions/frontends/data_flow_nodes/mappings.cpp
M	source/blender/simulations/bparticles/node_frontend.cpp
M	source/blender/simulations/bparticles/particle_function_builder.cpp

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

diff --git a/source/blender/blenkernel/BKE_node_tree.hpp b/source/blender/blenkernel/BKE_node_tree.hpp
index 73a196d10e5..db96ef0c5f6 100644
--- a/source/blender/blenkernel/BKE_node_tree.hpp
+++ b/source/blender/blenkernel/BKE_node_tree.hpp
@@ -144,12 +144,12 @@ class VirtualNode {
     return rna;
   }
 
-  const char *name()
+  StringRefNull name()
   {
     return m_bnode->name;
   }
 
-  const char *idname()
+  StringRefNull idname()
   {
     return m_bnode->idname;
   }
@@ -222,17 +222,17 @@ class VirtualSocket {
     return rna;
   }
 
-  const char *name()
+  StringRefNull name()
   {
     return m_bsocket->name;
   }
 
-  const char *idname()
+  StringRefNull idname()
   {
     return m_bsocket->idname;
   }
 
-  const char *identifier()
+  StringRefNull identifier()
   {
     return m_bsocket->identifier;
   }
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings.cpp
index 7aaa1ec6007..ec2b00858cc 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings.cpp
@@ -121,7 +121,7 @@ bool LinkInserters::insert(VTreeDataGraphBuilder &builder, VirtualSocket *from,
   BuilderOutputSocket *from_socket = builder.lookup_output_socket(from);
   BuilderInputSocket *to_socket = builder.lookup_input_socket(to);
 
-  if (STREQ(from->idname(), to->idname())) {
+  if (from->idname() == to->idname()) {
     builder.insert_link(from_socket, to_socket);
     return true;
   }
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index 87eadd8cc80..45cfd7d7c08 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -77,7 +77,7 @@ static Vector<VirtualSocket *> find_execute_sockets(VirtualNode *vnode, StringRe
   Vector<VirtualSocket *> execute_sockets;
   for (VirtualSocket *vsocket : vnode->inputs()) {
     if (StringRef(vsocket->name()).startswith(name_prefix)) {
-      if (STREQ(vsocket->idname(), "fn_OperatorSocket")) {
+      if (vsocket->idname() == "fn_OperatorSocket") {
         found_name = true;
         break;
       }
@@ -214,7 +214,7 @@ static std::unique_ptr<Action> build_action(VTreeDataGraph &vtree_data_graph, Vi
   }
 
   VirtualSocket *execute_socket = start->links()[0];
-  if (!STREQ(execute_socket->idname(), "bp_ExecuteSocket")) {
+  if (execute_socket->idname() != "bp_ExecuteSocket") {
     return std::unique_ptr<Action>(new NoneAction());
   }
 
diff --git a/source/blender/simulations/bparticles/particle_function_builder.cpp b/source/blender/simulations/bparticles/particle_function_builder.cpp
index 85fe8c004ee..890594f8cf3 100644
--- a/source/blender/simulations/bparticles/particle_function_builder.cpp
+++ b/source/blender/simulations/bparticles/particle_function_builder.cpp
@@ -73,7 +73,7 @@ using BuildInputProvider = std::function<ParticleFunctionInputProvider *(
 static ParticleFunctionInputProvider *INPUT_particle_info(VTreeDataGraph &vtree_data_graph,
                                                           VirtualSocket *vsocket)
 {
-  if (STREQ(vsocket->name(), "Age")) {
+  if (vsocket->name() == "Age") {
     return new AgeInputProvider();
   }
   else {
@@ -86,10 +86,10 @@ static ParticleFunctionInputProvider *INPUT_particle_info(VTreeDataGraph &vtree_
 static ParticleFunctionInputProvider *INPUT_surface_info(VTreeDataGraph &UNUSED(vtree_data_graph),
                                                          VirtualSocket *vsocket)
 {
-  if (STREQ(vsocket->name(), "Normal")) {
+  if (vsocket->name() == "Normal") {
     return new SurfaceNormalInputProvider();
   }
-  else if (STREQ(vsocket->name(), "Velocity")) {
+  else if (vsocket->name() == "Velocity") {
     return new SurfaceVelocityInputProvider();
   }
   else {