[Bf-blender-cvs] [c27bbb3ecad] functions: use more correct type name
Jacques Lucke
noreply at git.blender.org
Sun Apr 28 00:30:19 CEST 2019
Commit: c27bbb3ecad05404c1e069a0c6144d408109d97d
Author: Jacques Lucke
Date: Sat Apr 27 23:59:33 2019 +0200
Branches: functions
https://developer.blender.org/rBc27bbb3ecad05404c1e069a0c6144d408109d97d
use more correct type name
===================================================================
M source/blender/functions/core/function_graph.hpp
M source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
===================================================================
diff --git a/source/blender/functions/core/function_graph.hpp b/source/blender/functions/core/function_graph.hpp
index 1aa36119fd9..34ba800e416 100644
--- a/source/blender/functions/core/function_graph.hpp
+++ b/source/blender/functions/core/function_graph.hpp
@@ -4,16 +4,18 @@
namespace FN {
-using DFGraphSocketVector = SmallSetVector<DFGraphSocket>;
+using DFGraphSocketSetVector = SmallSetVector<DFGraphSocket>;
class FunctionGraph {
private:
SharedDataFlowGraph m_graph;
- DFGraphSocketVector m_inputs;
- DFGraphSocketVector m_outputs;
+ DFGraphSocketSetVector m_inputs;
+ DFGraphSocketSetVector m_outputs;
public:
- FunctionGraph(SharedDataFlowGraph graph, DFGraphSocketVector inputs, DFGraphSocketVector outputs)
+ FunctionGraph(SharedDataFlowGraph graph,
+ DFGraphSocketSetVector inputs,
+ DFGraphSocketSetVector outputs)
: m_graph(std::move(graph)), m_inputs(std::move(inputs)), m_outputs(std::move(outputs))
{
}
@@ -28,12 +30,12 @@ class FunctionGraph {
return m_graph;
}
- const DFGraphSocketVector &inputs() const
+ const DFGraphSocketSetVector &inputs() const
{
return m_inputs;
}
- const DFGraphSocketVector &outputs() const
+ const DFGraphSocketSetVector &outputs() const
{
return m_outputs;
}
diff --git a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
index 1932e97bbee..997e612e63b 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
@@ -243,7 +243,7 @@ static FunctionGraph finalize_function_graph(DataFlowGraphBuilder &builder,
DataFlowGraph::ToBuilderMapping builder_mapping;
auto compact_graph = DataFlowGraph::FromBuilder(builder, builder_mapping);
- DFGraphSocketVector inputs, outputs;
+ DFGraphSocketSetVector inputs, outputs;
for (DFGB_Socket socket : input_sockets) {
inputs.add(builder_mapping.map_socket(socket));
More information about the Bf-blender-cvs
mailing list