diff options
author | Jacques Lucke <mail@jlucke.com> | 2020-01-03 16:43:00 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2020-01-03 16:43:00 +0300 |
commit | 2c68bb3e512927f79a4b50c3f527ab4248ccafbf (patch) | |
tree | 3b82290799bb12012d03157bfe68235b6e390e32 | |
parent | c505fc4d23d5d982595a2c4064a15ef1ad799ed9 (diff) |
cleanup naming
-rw-r--r-- | source/blender/functions/FN_node_tree_multi_function_network.h | 14 | ||||
-rw-r--r-- | source/blender/functions/intern/node_tree_multi_function_network/generate.cc | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/functions/FN_node_tree_multi_function_network.h b/source/blender/functions/FN_node_tree_multi_function_network.h index 1bd33acd70c..dc768858d99 100644 --- a/source/blender/functions/FN_node_tree_multi_function_network.h +++ b/source/blender/functions/FN_node_tree_multi_function_network.h @@ -13,7 +13,7 @@ namespace FN { using BLI::IndexToRefMap; using BLI::MultiMap; -class InlinedTreeMFSocketMap { +class DummySocketMap { private: const FunctionNodeTree *m_function_tree; const MFNetwork *m_network; @@ -22,10 +22,10 @@ class InlinedTreeMFSocketMap { IndexToRefMap<const FSocket> m_fsocket_by_dummy_socket_id; public: - InlinedTreeMFSocketMap(const FunctionNodeTree &function_tree, - const MFNetwork &network, - IndexToRefMap<const MFSocket> dummy_socket_by_fsocket_id, - IndexToRefMap<const FSocket> fsocket_by_dummy_socket_id) + DummySocketMap(const FunctionNodeTree &function_tree, + const MFNetwork &network, + IndexToRefMap<const MFSocket> dummy_socket_by_fsocket_id, + IndexToRefMap<const FSocket> fsocket_by_dummy_socket_id) : m_function_tree(&function_tree), m_network(&network), m_dummy_socket_by_fsocket_id(std::move(dummy_socket_by_fsocket_id)), @@ -70,12 +70,12 @@ class FunctionTreeMFNetwork { private: const FunctionNodeTree &m_function_tree; std::unique_ptr<MFNetwork> m_network; - InlinedTreeMFSocketMap m_socket_map; + DummySocketMap m_socket_map; public: FunctionTreeMFNetwork(const FunctionNodeTree &function_tree, std::unique_ptr<MFNetwork> network, - InlinedTreeMFSocketMap socket_map) + DummySocketMap socket_map) : m_function_tree(function_tree), m_network(std::move(network)), m_socket_map(std::move(socket_map)) 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 f59b34295f5..6e2b5e33317 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 @@ -161,10 +161,10 @@ static std::unique_ptr<FunctionTreeMFNetwork> build( fsocket_by_dummy_socket_id.add_new(pair.second, fsocket); } - InlinedTreeMFSocketMap socket_map(function_tree, - *network, - std::move(dummy_socket_by_fsocket_id), - std::move(fsocket_by_dummy_socket_id)); + DummySocketMap socket_map(function_tree, + *network, + std::move(dummy_socket_by_fsocket_id), + std::move(fsocket_by_dummy_socket_id)); return BLI::make_unique<FunctionTreeMFNetwork>( function_tree, std::move(network), std::move(socket_map)); |