[Bf-blender-cvs] [0d81bf5cb07] functions: fixes after merge

Jacques Lucke noreply at git.blender.org
Sat Sep 14 12:49:16 CEST 2019


Commit: 0d81bf5cb07624143200db390f962af456f112fb
Author: Jacques Lucke
Date:   Sat Sep 14 12:48:25 2019 +0200
Branches: functions
https://developer.blender.org/rB0d81bf5cb07624143200db390f962af456f112fb

fixes after merge

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

M	source/blender/blenkernel/BKE_attributes_block_container.hpp
M	source/blender/blenkernel/BKE_attributes_ref.hpp
M	source/blender/functions/backends/dependencies/dependencies.hpp
M	source/blender/functions/core/function_graph.cpp
M	source/blender/functions/core/function_graph.hpp
M	source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
M	source/blender/simulations/bparticles/node_frontend.cpp
M	source/blender/simulations/bparticles/particle_function_builder.cpp
M	source/blender/simulations/bparticles/particles_state.hpp

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

diff --git a/source/blender/blenkernel/BKE_attributes_block_container.hpp b/source/blender/blenkernel/BKE_attributes_block_container.hpp
index 5f1d781206d..5f5b3bab91a 100644
--- a/source/blender/blenkernel/BKE_attributes_block_container.hpp
+++ b/source/blender/blenkernel/BKE_attributes_block_container.hpp
@@ -15,7 +15,7 @@ class AttributesBlockContainer : BLI::NonCopyable, BLI::NonMovable {
  private:
   AttributesInfo m_attributes_info;
   uint m_block_size;
-  SetVector<AttributesBlock *> m_active_blocks;
+  VectorSet<AttributesBlock *> m_active_blocks;
   std::mutex m_blocks_mutex;
   std::atomic<uint> m_next_id;
 
diff --git a/source/blender/blenkernel/BKE_attributes_ref.hpp b/source/blender/blenkernel/BKE_attributes_ref.hpp
index f6ad9ecbaf0..6a3e37da5f6 100644
--- a/source/blender/blenkernel/BKE_attributes_ref.hpp
+++ b/source/blender/blenkernel/BKE_attributes_ref.hpp
@@ -32,7 +32,7 @@
 #include "BLI_math_cxx.h"
 #include "BLI_optional.h"
 #include "BLI_index_range.h"
-#include "BLI_set_vector.h"
+#include "BLI_vector_set.h"
 #include "BLI_set.h"
 #include "BLI_string_map.h"
 #include "BLI_string_ref.h"
@@ -48,11 +48,11 @@ using BLI::MutableArrayRef;
 using BLI::Optional;
 using BLI::rgba_b;
 using BLI::rgba_f;
-using BLI::SetVector;
 using BLI::StringMap;
 using BLI::StringRef;
 using BLI::StringRefNull;
 using BLI::Vector;
+using BLI::VectorSet;
 
 /**
  * Possible types of attributes. All types are expected to be POD (plain old data).
@@ -137,7 +137,7 @@ class AttributesInfo;
 
 class AttributesDeclaration {
  private:
-  SetVector<std::string> m_names;
+  VectorSet<std::string> m_names;
   Vector<AttributeType> m_types;
   Vector<AnyAttributeValue> m_defaults;
 
diff --git a/source/blender/functions/backends/dependencies/dependencies.hpp b/source/blender/functions/backends/dependencies/dependencies.hpp
index 026c5e13184..41c5d6b0a84 100644
--- a/source/blender/functions/backends/dependencies/dependencies.hpp
+++ b/source/blender/functions/backends/dependencies/dependencies.hpp
@@ -12,8 +12,8 @@ namespace FN {
 using BLI::MultiMap;
 
 struct DependencyComponents {
-  SetVector<Object *> transform_dependencies;
-  SetVector<Object *> geometry_dependencies;
+  VectorSet<Object *> transform_dependencies;
+  VectorSet<Object *> geometry_dependencies;
 };
 
 class FunctionDepsBuilder {
diff --git a/source/blender/functions/core/function_graph.cpp b/source/blender/functions/core/function_graph.cpp
index 815684b1874..45a0a8ad4ec 100644
--- a/source/blender/functions/core/function_graph.cpp
+++ b/source/blender/functions/core/function_graph.cpp
@@ -14,7 +14,7 @@ Set<DataSocket> FunctionGraph::find_used_sockets(bool include_inputs, bool inclu
 {
   Set<DataSocket> found;
 
-  SetVector<DataSocket> to_be_checked;
+  VectorSet<DataSocket> to_be_checked;
   for (DataSocket socket : m_outputs) {
     to_be_checked.add_new(socket);
   }
diff --git a/source/blender/functions/core/function_graph.hpp b/source/blender/functions/core/function_graph.hpp
index 452300367da..5425c025e61 100644
--- a/source/blender/functions/core/function_graph.hpp
+++ b/source/blender/functions/core/function_graph.hpp
@@ -6,23 +6,23 @@
  * graph.
  */
 
-#include "BLI_set_vector.h"
+#include "BLI_vector_set.h"
 #include "BLI_set.h"
 
 #include "data_graph.hpp"
 
 namespace FN {
 
-using BLI::SetVector;
+using BLI::VectorSet;
 
 class FunctionGraph {
  private:
   SharedDataGraph m_graph;
-  SetVector<DataSocket> m_inputs;
-  SetVector<DataSocket> m_outputs;
+  VectorSet<DataSocket> m_inputs;
+  VectorSet<DataSocket> m_outputs;
 
  public:
-  FunctionGraph(SharedDataGraph graph, SetVector<DataSocket> inputs, SetVector<DataSocket> outputs)
+  FunctionGraph(SharedDataGraph graph, VectorSet<DataSocket> inputs, VectorSet<DataSocket> outputs)
       : m_graph(std::move(graph)), m_inputs(std::move(inputs)), m_outputs(std::move(outputs))
   {
   }
@@ -37,12 +37,12 @@ class FunctionGraph {
     return m_graph;
   }
 
-  const SetVector<DataSocket> &inputs() const
+  const VectorSet<DataSocket> &inputs() const
   {
     return m_inputs;
   }
 
-  const SetVector<DataSocket> &outputs() const
+  const VectorSet<DataSocket> &outputs() const
   {
     return m_outputs;
   }
diff --git a/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp b/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
index bfc6dd3578a..29ea69f6a78 100644
--- a/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
@@ -11,8 +11,8 @@ namespace DataFlowNodes {
 
 static void find_interface_sockets(VirtualNodeTree &vtree,
                                    VTreeDataGraph &data_graph,
-                                   SetVector<DataSocket> &r_inputs,
-                                   SetVector<DataSocket> &r_outputs)
+                                   VectorSet<DataSocket> &r_inputs,
+                                   VectorSet<DataSocket> &r_outputs)
 {
   VirtualNode *input_node = vtree.nodes_with_idname("fn_FunctionInputNode").get(0, nullptr);
   VirtualNode *output_node = vtree.nodes_with_idname("fn_FunctionOutputNode").get(0, nullptr);
@@ -41,8 +41,8 @@ static ValueOrError<FunctionGraph> generate_function_graph(VirtualNodeTree &vtre
 
   std::unique_ptr<VTreeDataGraph> data_graph = data_graph_or_error.extract_value();
 
-  SetVector<DataSocket> input_sockets;
-  SetVector<DataSocket> output_sockets;
+  VectorSet<DataSocket> input_sockets;
+  VectorSet<DataSocket> output_sockets;
   find_interface_sockets(vtree, *data_graph, input_sockets, output_sockets);
 
   return FunctionGraph(data_graph->graph(), input_sockets, output_sockets);
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index bfcd0f97555..72c25141f4a 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -83,7 +83,7 @@ class VTreeData {
 
   TupleCallBody &function_body_for_inputs(VirtualNode *vnode, ArrayRef<uint> input_indices)
   {
-    SetVector<DataSocket> sockets_to_compute;
+    VectorSet<DataSocket> sockets_to_compute;
     for (uint index : input_indices) {
       sockets_to_compute.add_new(m_vtree_data_graph.lookup_socket(vnode->input(index)));
     }
@@ -97,7 +97,7 @@ class VTreeData {
 
   TupleCallBody &function_body_for_all_inputs(VirtualNode *vnode)
   {
-    SetVector<DataSocket> sockets_to_compute;
+    VectorSet<DataSocket> sockets_to_compute;
     for (VirtualSocket *vsocket : vnode->inputs()) {
       if (m_vtree_data_graph.uses_socket(vsocket)) {
         sockets_to_compute.add_new(m_vtree_data_graph.lookup_socket(vsocket));
@@ -135,7 +135,7 @@ static std::unique_ptr<Action> build_action_list(VTreeData &vtree_data,
                                                  StringRef name);
 
 static void find_connected_particle_type_nodes__recursive(VirtualSocket *output_vsocket,
-                                                          SetVector<VirtualNode *> &r_nodes)
+                                                          VectorSet<VirtualNode *> &r_nodes)
 {
   BLI_assert(output_vsocket->is_output());
   for (VirtualSocket *connected : output_vsocket->links()) {
@@ -151,7 +151,7 @@ static void find_connected_particle_type_nodes__recursive(VirtualSocket *output_
 
 static Vector<VirtualNode *> find_connected_particle_type_nodes(VirtualSocket *output_vsocket)
 {
-  SetVector<VirtualNode *> type_nodes;
+  VectorSet<VirtualNode *> type_nodes;
   find_connected_particle_type_nodes__recursive(output_vsocket, type_nodes);
   return Vector<VirtualNode *>(type_nodes);
 }
diff --git a/source/blender/simulations/bparticles/particle_function_builder.cpp b/source/blender/simulations/bparticles/particle_function_builder.cpp
index 10644472c6f..d5d0c45d9e5 100644
--- a/source/blender/simulations/bparticles/particle_function_builder.cpp
+++ b/source/blender/simulations/bparticles/particle_function_builder.cpp
@@ -32,12 +32,12 @@ Vector<DataSocket> find_input_data_sockets(VirtualNode *vnode, VTreeDataGraph &d
   return inputs;
 }
 
-static SetVector<VirtualSocket *> find_particle_dependencies(
+static VectorSet<VirtualSocket *> find_particle_dependencies(
     VTreeDataGraph &data_graph,
     ArrayRef<DataSocket> sockets,
     MutableArrayRef<bool> r_depends_on_particle_flags)
 {
-  SetVector<VirtualSocket *> combined_dependencies;
+  VectorSet<VirtualSocket *> combined_dependencies;
 
   for (uint i = 0; i < sockets.size(); i++) {
     DataSocket socket = sockets[i];
diff --git a/source/blender/simulations/bparticles/particles_state.hpp b/source/blender/simulations/bparticles/particles_state.hpp
index 24e23e4373b..9e80af8540b 100644
--- a/source/blender/simulations/bparticles/particles_state.hpp
+++ b/source/blender/simulations/bparticles/particles_state.hpp
@@ -15,11 +15,11 @@ using BLI::IndexRange;
 using BLI::Map;
 using BLI::MutableArrayRef;
 using BLI::Set;
-using BLI::SetVector;
 using BLI::StringMap;
 using BLI::StringRef;
 using BLI::StringRefNull;
 using BLI::Vector;
+using BLI::VectorSet;
 
 class ParticlesState {
  private:



More information about the Bf-blender-cvs mailing list