[Bf-blender-cvs] [c505fc4d23d] functions: cleanup naming

[Jacques Lucke]

Commit: c505fc4d23d5d982595a2c4064a15ef1ad799ed9
Author: Jacques Lucke
Date:   Fri Jan 3 14:41:18 2020 +0100
Branches: functions
https://developer.blender.org/rBc505fc4d23d5d982595a2c4064a15ef1ad799ed9

cleanup naming

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

M	source/blender/functions/intern/node_tree_multi_function_network/builder.cc
M	source/blender/functions/intern/node_tree_multi_function_network/builder.h
M	source/blender/functions/intern/node_tree_multi_function_network/generate.cc

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

diff --git a/source/blender/functions/intern/node_tree_multi_function_network/builder.cc b/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
index dddb4f0379c..cc7d6782ce2 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
@@ -6,14 +6,14 @@ using BLI::ScopedVector;
 
 FunctionTreeMFNetworkBuilder::FunctionTreeMFNetworkBuilder(
     const FunctionNodeTree &function_tree,
-    const PreprocessedVTreeMFData &preprocessed_function_tree_data,
+    const FSocketDataTypes &preprocessed_function_tree_data,
     const VTreeMultiFunctionMappings &function_tree_mappings,
     ResourceCollector &resources,
     IndexToRefMultiMap<MFBuilderSocket> &sockets_by_fsocket_id,
     IndexToRefMap<MFBuilderOutputSocket> &socket_by_group_input_id,
     MFNetworkBuilder &builder)
     : m_function_tree(function_tree),
-      m_preprocessed_function_tree_data(preprocessed_function_tree_data),
+      m_fsocket_data_types(preprocessed_function_tree_data),
       m_function_tree_mappings(function_tree_mappings),
       m_resources(resources),
       m_sockets_by_fsocket_id(sockets_by_fsocket_id),
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/builder.h b/source/blender/functions/intern/node_tree_multi_function_network/builder.h
index 24c85f51503..eda3d3f5342 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/builder.h
+++ b/source/blender/functions/intern/node_tree_multi_function_network/builder.h
@@ -13,13 +13,13 @@ using BKE::VSocket;
 using BLI::IndexToRefMultiMap;
 using BLI::MultiMap;
 
-class PreprocessedVTreeMFData {
+class FSocketDataTypes {
  private:
   Array<Optional<MFDataType>> m_data_type_by_fsocket_id;
   Array<Optional<MFDataType>> m_data_type_by_group_input_id;
 
  public:
-  PreprocessedVTreeMFData(const FunctionNodeTree &function_tree)
+  FSocketDataTypes(const FunctionNodeTree &function_tree)
   {
     auto &mappings = get_function_tree_multi_function_mappings();
 
@@ -61,7 +61,7 @@ class PreprocessedVTreeMFData {
 class FunctionTreeMFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
  private:
   const FunctionNodeTree &m_function_tree;
-  const PreprocessedVTreeMFData &m_preprocessed_function_tree_data;
+  const FSocketDataTypes &m_fsocket_data_types;
   const VTreeMultiFunctionMappings &m_function_tree_mappings;
   ResourceCollector &m_resources;
 
@@ -72,7 +72,7 @@ class FunctionTreeMFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
 
  public:
   FunctionTreeMFNetworkBuilder(const FunctionNodeTree &function_tree,
-                               const PreprocessedVTreeMFData &preprocessed_function_tree_data,
+                               const FSocketDataTypes &preprocessed_function_tree_data,
                                const VTreeMultiFunctionMappings &function_tree_mappings,
                                ResourceCollector &resources,
                                IndexToRefMultiMap<MFBuilderSocket> &sockets_by_fsocket_id,
@@ -133,17 +133,17 @@ class FunctionTreeMFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
 
   Optional<MFDataType> try_get_data_type(const FSocket &fsocket) const
   {
-    return m_preprocessed_function_tree_data.try_lookup_data_type(fsocket);
+    return m_fsocket_data_types.try_lookup_data_type(fsocket);
   }
 
   bool is_data_socket(const FSocket &fsocket) const
   {
-    return m_preprocessed_function_tree_data.is_data_socket(fsocket);
+    return m_fsocket_data_types.is_data_socket(fsocket);
   }
 
   bool is_data_group_input(const FGroupInput &group_input) const
   {
-    return m_preprocessed_function_tree_data.is_data_group_input(group_input);
+    return m_fsocket_data_types.is_data_group_input(group_input);
   }
 
   void map_data_sockets(const FNode &fnode, MFBuilderNode &node);
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
index 6137cc92a5a..f59b34295f5 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
@@ -174,14 +174,14 @@ std::unique_ptr<FunctionTreeMFNetwork> generate_node_tree_multi_function_network
     const FunctionNodeTree &function_tree, ResourceCollector &resources)
 {
   const VTreeMultiFunctionMappings &mappings = get_function_tree_multi_function_mappings();
-  PreprocessedVTreeMFData preprocessed_data{function_tree};
+  FSocketDataTypes fsocket_data_types{function_tree};
   IndexToRefMultiMap<MFBuilderSocket> sockets_by_fsocket_id(function_tree.all_sockets().size());
   IndexToRefMap<MFBuilderOutputSocket> socket_by_group_input_id(
       function_tree.all_group_inputs().size());
   auto network_builder = BLI::make_unique<MFNetworkBuilder>();
 
   FunctionTreeMFNetworkBuilder builder(function_tree,
-                                       preprocessed_data,
+                                       fsocket_data_types,
                                        mappings,
                                        resources,
                                        sockets_by_fsocket_id,