[Bf-blender-cvs] [5e49e3df6e4] functions: move code into sub namespace
Jacques Lucke
noreply at git.blender.org
Sat Jan 4 16:38:52 CET 2020
Commit: 5e49e3df6e40b16a9baedb29c89b55b613c99516
Author: Jacques Lucke
Date: Sat Jan 4 13:23:35 2020 +0100
Branches: functions
https://developer.blender.org/rB5e49e3df6e40b16a9baedb29c89b55b613c99516
move code into sub namespace
===================================================================
M source/blender/functions/FN_node_tree_multi_function_network_generation.h
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
M source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
M source/blender/functions/intern/node_tree_multi_function_network/mappings.h
M source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
M source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
M source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
M source/blender/modifiers/intern/MOD_functionpoints_cxx.cc
M source/blender/simulations/bparticles/node_frontend.cpp
===================================================================
diff --git a/source/blender/functions/FN_node_tree_multi_function_network_generation.h b/source/blender/functions/FN_node_tree_multi_function_network_generation.h
index 993595a303a..def011b2007 100644
--- a/source/blender/functions/FN_node_tree_multi_function_network_generation.h
+++ b/source/blender/functions/FN_node_tree_multi_function_network_generation.h
@@ -6,6 +6,7 @@
#include "intern/multi_functions/network.h"
namespace FN {
+namespace MFGeneration {
using BLI::ResourceCollector;
@@ -15,6 +16,7 @@ std::unique_ptr<FunctionTreeMFNetwork> generate_node_tree_multi_function_network
std::unique_ptr<MF_EvaluateNetwork> generate_node_tree_multi_function(
const FunctionNodeTree &function_tree, ResourceCollector &resources);
+} // namespace MFGeneration
} // namespace FN
#endif /* __FN_VTREE_MULTI_FUNCTION_NETWORK_GENERATION_H__ */
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 9fdee6aae4a..542aca335d5 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
@@ -1,6 +1,7 @@
#include "builder.h"
namespace FN {
+namespace MFGeneration {
using BLI::ScopedVector;
@@ -93,4 +94,5 @@ const MultiFunction &FNodeMFNetworkBuilder::get_vectorized_function(
}
}
+} // namespace MFGeneration
} // namespace FN
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 4bed3d6b809..66f7c530309 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
@@ -8,6 +8,7 @@
#include "mappings.h"
namespace FN {
+namespace MFGeneration {
using BKE::VSocket;
using BLI::IndexToRefMultiMap;
@@ -419,4 +420,5 @@ class ImplicitConversionMFBuilder : public FunctionTreeMFBuilderBase {
}
};
+} // namespace MFGeneration
} // namespace FN
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 62eea1cfdff..c27fc382032 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
@@ -9,6 +9,7 @@
#include "builder.h"
namespace FN {
+namespace MFGeneration {
static bool insert_nodes(FunctionTreeMFBuilderCommonData &common)
{
@@ -221,4 +222,5 @@ std::unique_ptr<MF_EvaluateNetwork> generate_node_tree_multi_function(
return function;
}
+} // namespace MFGeneration
} // namespace FN
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc b/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
index c0eea08ceb6..a5be57e6513 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
@@ -6,6 +6,7 @@
#include "FN_multi_functions.h"
namespace FN {
+namespace MFGeneration {
BLI_LAZY_INIT_REF(const VTreeMultiFunctionMappings, get_function_tree_multi_function_mappings)
{
@@ -15,4 +16,5 @@ BLI_LAZY_INIT_REF(const VTreeMultiFunctionMappings, get_function_tree_multi_func
return mappings;
}
+} // namespace MFGeneration
} // namespace FN
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings.h b/source/blender/functions/intern/node_tree_multi_function_network/mappings.h
index a3bb649f9c5..d54b336a885 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings.h
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings.h
@@ -7,6 +7,7 @@
#include "FN_node_tree_multi_function_network.h"
namespace FN {
+namespace MFGeneration {
using BLI::Map;
using BLI::ResourceCollector;
@@ -37,4 +38,5 @@ void add_function_tree_node_mapping_info(VTreeMultiFunctionMappings &mappings);
const VTreeMultiFunctionMappings &get_function_tree_multi_function_mappings();
+} // namespace MFGeneration
} // namespace FN
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc b/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
index 79d493f883e..adb35f2b3b1 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
@@ -9,6 +9,7 @@
#include "BKE_surface_hook.h"
namespace FN {
+namespace MFGeneration {
using BLI::float3;
static void INSERT_combine_color(FNodeMFNetworkBuilder &builder)
@@ -623,4 +624,5 @@ void add_function_tree_node_mapping_info(VTreeMultiFunctionMappings &mappings)
mappings.fnode_inserters.add_new("fn_EventFilterDurationNode", INSERT_event_filter_duration);
}
-}; // namespace FN
+} // namespace MFGeneration
+} // namespace FN
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc b/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
index ed416ed5beb..63134523d8b 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
@@ -8,6 +8,7 @@
#include "FN_multi_functions.h"
namespace FN {
+namespace MFGeneration {
/* Socket Inserters
**********************************************************/
@@ -177,4 +178,5 @@ void add_function_tree_socket_mapping_info(VTreeMultiFunctionMappings &mappings)
add_bidirectional_implicit_conversion<int32_t, bool>(mappings);
}
-}; // namespace FN
+} // namespace MFGeneration
+} // namespace FN
diff --git a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
index 3be31a74ef7..ea379c10316 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
+++ b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
@@ -49,7 +49,7 @@ void MOD_functiondeform_do(FunctionDeformModifierData *fdmd,
FunctionNodeTree function_tree(btree, vtrees);
BLI::ResourceCollector resources;
- auto function = FN::generate_node_tree_multi_function(function_tree, resources);
+ auto function = FN::MFGeneration::generate_node_tree_multi_function(function_tree, resources);
MFParamsBuilder params_builder(*function, numVerts);
params_builder.add_readonly_single_input(ArrayRef<float3>((float3 *)vertexCos, numVerts));
diff --git a/source/blender/modifiers/intern/MOD_functionpoints_cxx.cc b/source/blender/modifiers/intern/MOD_functionpoints_cxx.cc
index 8ea620b5194..f28b260ab39 100644
--- a/source/blender/modifiers/intern/MOD_functionpoints_cxx.cc
+++ b/source/blender/modifiers/intern/MOD_functionpoints_cxx.cc
@@ -45,7 +45,7 @@ Mesh *MOD_functionpoints_do(FunctionPointsModifierData *fpmd,
FunctionNodeTree function_tree(btree, vtrees);
BLI::ResourceCollector resources;
- auto function = FN::generate_node_tree_multi_function(function_tree, resources);
+ auto function = FN::MFGeneration::generate_node_tree_multi_function(function_tree, resources);
MFParamsBuilder params_builder(*function, 1);
params_builder.add_readonly_single_input(&fpmd->control1);
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index abe17a74db0..22fdcccdb26 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -1128,7 +1128,7 @@ class NodeTreeStepSimulator : public StepSimulator {
ResourceCollector resources;
std::unique_ptr<FunctionTreeMFNetwork> data_graph =
- FN::generate_node_tree_multi_function_network(m_function_tree, resources);
+ FN::MFGeneration::generate_node_tree_multi_function_network(m_function_tree, resources);
if (data_graph.get() == nullptr) {
return;
}
More information about the Bf-blender-cvs
mailing list