[Bf-blender-cvs] [375577cfb96] functions: improve file names
Jacques Lucke
noreply at git.blender.org
Fri Aug 2 19:15:04 CEST 2019
Commit: 375577cfb96ee84576e87e4ecd458f91bee9ccc8
Author: Jacques Lucke
Date: Fri Aug 2 14:10:39 2019 +0200
Branches: functions
https://developer.blender.org/rB375577cfb96ee84576e87e4ecd458f91bee9ccc8
improve file names
===================================================================
M source/blender/functions/CMakeLists.txt
R096 source/blender/functions/frontends/data_flow_nodes/mappings/conversions.cpp source/blender/functions/frontends/data_flow_nodes/mappings/conversion_inserters.cpp
R099 source/blender/functions/frontends/data_flow_nodes/mappings/nodes.cpp source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
M source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
M source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
R097 source/blender/functions/frontends/data_flow_nodes/mappings/sockets.cpp source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
===================================================================
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index f61d1738cff..9fbddc4ccbc 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -148,9 +148,9 @@ set(SRC
frontends/data_flow_nodes/mappings/mappings.hpp
frontends/data_flow_nodes/mappings/registry.hpp
frontends/data_flow_nodes/mappings/registry.cpp
- frontends/data_flow_nodes/mappings/nodes.cpp
- frontends/data_flow_nodes/mappings/sockets.cpp
- frontends/data_flow_nodes/mappings/conversions.cpp
+ frontends/data_flow_nodes/mappings/node_inserters.cpp
+ frontends/data_flow_nodes/mappings/socket_loaders.cpp
+ frontends/data_flow_nodes/mappings/conversion_inserters.cpp
frontends/data_flow_nodes/mappings/type_mappings.cpp
frontends/data_flow_nodes/vtree_data_graph.hpp
frontends/data_flow_nodes/vtree_data_graph.cpp
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/conversions.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/conversion_inserters.cpp
similarity index 96%
rename from source/blender/functions/frontends/data_flow_nodes/mappings/conversions.cpp
rename to source/blender/functions/frontends/data_flow_nodes/mappings/conversion_inserters.cpp
index aaa18b515a1..42c1bf48243 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/conversions.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/conversion_inserters.cpp
@@ -16,7 +16,7 @@ static void INSERT_base_to_list(VTreeDataGraphBuilder &builder,
builder.insert_link(node->output(0), to);
}
-void register_conversion_inserters(ConversionInserterRegistry ®istry)
+void REGISTER_conversion_inserters(ConversionInserterRegistry ®istry)
{
registry.function("Boolean", "Integer", Functions::GET_FN_bool_to_int32);
registry.function("Boolean", "Float", Functions::GET_FN_bool_to_float);
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/nodes.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
similarity index 99%
rename from source/blender/functions/frontends/data_flow_nodes/mappings/nodes.cpp
rename to source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
index f74bafef409..b3a799ab4c4 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/nodes.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
@@ -306,7 +306,7 @@ static void INSERT_compare(VTreeDataGraphBuilder &builder, VirtualNode *vnode)
builder.insert_matching_function(fn, vnode);
}
-void register_node_inserters(NodeInserterRegistry ®istry)
+void REGISTER_node_inserters(NodeInserterRegistry ®istry)
{
registry.function("fn_VectorDistanceNode", Functions::GET_FN_vector_distance);
registry.function("fn_RandomNumberNode", Functions::GET_FN_random_number);
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
index 7da7d6452f1..ede993f98e7 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
@@ -9,7 +9,7 @@ BLI_LAZY_INIT(StringMap<NodeInserter>, MAPPING_node_inserters)
{
StringMap<NodeInserter> map;
NodeInserterRegistry registry(map);
- register_node_inserters(registry);
+ REGISTER_node_inserters(registry);
return map;
}
@@ -17,7 +17,7 @@ BLI_LAZY_INIT(StringMap<SocketLoader>, MAPPING_socket_loaders)
{
StringMap<SocketLoader> map;
SocketLoaderRegistry registry(map);
- register_socket_loaders(registry);
+ REGISTER_socket_loaders(registry);
return map;
}
@@ -26,7 +26,7 @@ BLI_LAZY_INIT(ConversionInserterMap, MAPPING_conversion_inserters)
{
Map<StringPair, ConversionInserter> map;
ConversionInserterRegistry registry(map);
- register_conversion_inserters(registry);
+ REGISTER_conversion_inserters(registry);
return map;
}
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
index 6c2d26fd381..d004f6c7725 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
@@ -82,9 +82,9 @@ class ConversionInserterRegistry {
}
};
-void register_socket_loaders(SocketLoaderRegistry ®istry);
-void register_node_inserters(NodeInserterRegistry ®istry);
-void register_conversion_inserters(ConversionInserterRegistry ®istry);
+void REGISTER_socket_loaders(SocketLoaderRegistry ®istry);
+void REGISTER_node_inserters(NodeInserterRegistry ®istry);
+void REGISTER_conversion_inserters(ConversionInserterRegistry ®istry);
} // namespace DataFlowNodes
} // namespace FN
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/sockets.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
similarity index 97%
rename from source/blender/functions/frontends/data_flow_nodes/mappings/sockets.cpp
rename to source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
index f330ad160fc..4a7b01d83d7 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/sockets.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
@@ -55,7 +55,7 @@ template<typename T> static void LOAD_empty_list(PointerRNA *UNUSED(rna), Tuple
tuple.move_in(index, list);
}
-void register_socket_loaders(SocketLoaderRegistry ®istry)
+void REGISTER_socket_loaders(SocketLoaderRegistry ®istry)
{
registry.loader("Float", LOAD_float);
registry.loader("Vector", LOAD_vector);
More information about the Bf-blender-cvs
mailing list