[Bf-blender-cvs] [0ef25d80018] functions: cleanup

[Jacques Lucke]

Commit: 0ef25d800189f41e1b604a7f766c649a5a9ac847
Author: Jacques Lucke
Date:   Thu Aug 1 14:36:52 2019 +0200
Branches: functions
https://developer.blender.org/rB0ef25d800189f41e1b604a7f766c649a5a9ac847

cleanup

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

M	source/blender/functions/core/data_graph_builder.hpp
M	source/blender/simulations/bparticles/inserters.cpp

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

diff --git a/source/blender/functions/core/data_graph_builder.hpp b/source/blender/functions/core/data_graph_builder.hpp
index 107a2c4e15e..fc3de824585 100644
--- a/source/blender/functions/core/data_graph_builder.hpp
+++ b/source/blender/functions/core/data_graph_builder.hpp
@@ -102,6 +102,26 @@ class BuilderNode {
     return m_outputs;
   }
 
+  Vector<DataSocket> built_inputs()
+  {
+    Vector<DataSocket> sockets;
+    sockets.reserve(m_inputs.size());
+    for (BuilderInputSocket *socket : m_inputs) {
+      sockets.append_unchecked(DataSocket::FromInput(socket->input_id()));
+    }
+    return sockets;
+  }
+
+  Vector<DataSocket> built_outputs()
+  {
+    Vector<DataSocket> sockets;
+    sockets.reserve(m_outputs.size());
+    for (BuilderOutputSocket *socket : m_outputs) {
+      sockets.append_unchecked(DataSocket::FromOutput(socket->output_id()));
+    }
+    return sockets;
+  }
+
   BuilderInputSocket *input(uint index)
   {
     return m_inputs[index];
diff --git a/source/blender/simulations/bparticles/inserters.cpp b/source/blender/simulations/bparticles/inserters.cpp
index a70e2a66f8a..f6f6405b28b 100644
--- a/source/blender/simulations/bparticles/inserters.cpp
+++ b/source/blender/simulations/bparticles/inserters.cpp
@@ -352,15 +352,8 @@ static FN::FunctionGraph link_inputs_to_function(SharedFunction &main_fn,
 
   SharedDataGraph data_graph = builder.build();
 
-  SetVector<DataSocket> final_inputs;
-  for (FN::BuilderOutputSocket *socket : reserved_node->outputs()) {
-    final_inputs.add_new(DataSocket::FromOutput(socket->output_id()));
-  }
-  SetVector<DataSocket> final_outputs;
-  for (FN::BuilderOutputSocket *socket : main_node->outputs()) {
-    final_outputs.add_new(DataSocket::FromOutput(socket->output_id()));
-  }
-
+  auto final_inputs = reserved_node->built_outputs();
+  auto final_outputs = main_node->built_outputs();
   return FN::FunctionGraph(data_graph, final_inputs, final_outputs);
 }