rename functions2 to functions

48 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 5dbbfb7e619..98a93af93c7 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -111,7 +111,7 @@ add_subdirectory(nodes)
 add_subdirectory(modifiers)
 add_subdirectory(gpencil_modifiers)
 add_subdirectory(shader_fx)
-add_subdirectory(functions2)
+add_subdirectory(functions)
 add_subdirectory(simulations)
 add_subdirectory(makesdna)
 add_subdirectory(makesrna)
diff --git a/source/blender/functions2/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 30f37526015..c6cf83f8531 100644
--- a/source/blender/functions2/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -72,4 +72,4 @@ set(LIB
   bf_blenlib
 )
 
-blender_add_lib(bf_functions2 "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/functions2/FN_attributes_block_container.h b/source/blender/functions/FN_attributes_block_container.h
index 81cf57517a5..81cf57517a5 100644
--- a/source/blender/functions2/FN_attributes_block_container.h
+++ b/source/blender/functions/FN_attributes_block_container.h
diff --git a/source/blender/functions2/FN_attributes_ref.h b/source/blender/functions/FN_attributes_ref.h
index 753c5936d19..753c5936d19 100644
--- a/source/blender/functions2/FN_attributes_ref.h
+++ b/source/blender/functions/FN_attributes_ref.h
diff --git a/source/blender/functions2/FN_cpp_type.h b/source/blender/functions/FN_cpp_type.h
index 766b7c118dd..766b7c118dd 100644
--- a/source/blender/functions2/FN_cpp_type.h
+++ b/source/blender/functions/FN_cpp_type.h
diff --git a/source/blender/functions2/FN_generic_array_ref.h b/source/blender/functions/FN_generic_array_ref.h
index e6d688c97a6..e6d688c97a6 100644
--- a/source/blender/functions2/FN_generic_array_ref.h
+++ b/source/blender/functions/FN_generic_array_ref.h
diff --git a/source/blender/functions2/FN_generic_tuple.h b/source/blender/functions/FN_generic_tuple.h
index 0dc473d7e84..0dc473d7e84 100644
--- a/source/blender/functions2/FN_generic_tuple.h
+++ b/source/blender/functions/FN_generic_tuple.h
diff --git a/source/blender/functions2/FN_generic_vector_array.h b/source/blender/functions/FN_generic_vector_array.h
index c1f43dbdd91..c1f43dbdd91 100644
--- a/source/blender/functions2/FN_generic_vector_array.h
+++ b/source/blender/functions/FN_generic_vector_array.h
diff --git a/source/blender/functions2/FN_generic_virtual_list_list_ref.h b/source/blender/functions/FN_generic_virtual_list_list_ref.h
index 9cd90df4cb8..9cd90df4cb8 100644
--- a/source/blender/functions2/FN_generic_virtual_list_list_ref.h
+++ b/source/blender/functions/FN_generic_virtual_list_list_ref.h
diff --git a/source/blender/functions2/FN_generic_virtual_list_ref.h b/source/blender/functions/FN_generic_virtual_list_ref.h
index 4a82cee716c..4a82cee716c 100644
--- a/source/blender/functions2/FN_generic_virtual_list_ref.h
+++ b/source/blender/functions/FN_generic_virtual_list_ref.h
diff --git a/source/blender/functions2/FN_initialize.h b/source/blender/functions/FN_initialize.h
index 10e8a68f02d..10e8a68f02d 100644
--- a/source/blender/functions2/FN_initialize.h
+++ b/source/blender/functions/FN_initialize.h
diff --git a/source/blender/functions2/FN_multi_function.h b/source/blender/functions/FN_multi_function.h
index 529be545379..529be545379 100644
--- a/source/blender/functions2/FN_multi_function.h
+++ b/source/blender/functions/FN_multi_function.h
diff --git a/source/blender/functions2/FN_multi_function_common_context_ids.h b/source/blender/functions/FN_multi_function_common_context_ids.h
index 05ede273586..05ede273586 100644
--- a/source/blender/functions2/FN_multi_function_common_context_ids.h
+++ b/source/blender/functions/FN_multi_function_common_context_ids.h
diff --git a/source/blender/functions2/FN_multi_function_context.h b/source/blender/functions/FN_multi_function_context.h
index dddd577c0c9..dddd577c0c9 100644
--- a/source/blender/functions2/FN_multi_function_context.h
+++ b/source/blender/functions/FN_multi_function_context.h
diff --git a/source/blender/functions2/FN_multi_function_data_type.h b/source/blender/functions/FN_multi_function_data_type.h
index af4cf02e4dc..af4cf02e4dc 100644
--- a/source/blender/functions2/FN_multi_function_data_type.h
+++ b/source/blender/functions/FN_multi_function_data_type.h
diff --git a/source/blender/functions2/FN_multi_function_mask.h b/source/blender/functions/FN_multi_function_mask.h
index fe056efdcad..fe056efdcad 100644
--- a/source/blender/functions2/FN_multi_function_mask.h
+++ b/source/blender/functions/FN_multi_function_mask.h
diff --git a/source/blender/functions2/FN_multi_function_network.h b/source/blender/functions/FN_multi_function_network.h
index b8fe94c02eb..b8fe94c02eb 100644
--- a/source/blender/functions2/FN_multi_function_network.h
+++ b/source/blender/functions/FN_multi_function_network.h
diff --git a/source/blender/functions2/FN_multi_function_param_type.h b/source/blender/functions/FN_multi_function_param_type.h
index e119bfd4967..e119bfd4967 100644
--- a/source/blender/functions2/FN_multi_function_param_type.h
+++ b/source/blender/functions/FN_multi_function_param_type.h
diff --git a/source/blender/functions2/FN_multi_functions.h b/source/blender/functions/FN_multi_functions.h
index c45360605b4..c45360605b4 100644
--- a/source/blender/functions2/FN_multi_functions.h
+++ b/source/blender/functions/FN_multi_functions.h
diff --git a/source/blender/functions2/FN_vtree_multi_function_network.h b/source/blender/functions/FN_vtree_multi_function_network.h
index 3fabf4d352b..3fabf4d352b 100644
--- a/source/blender/functions2/FN_vtree_multi_function_network.h
+++ b/source/blender/functions/FN_vtree_multi_function_network.h
diff --git a/source/blender/functions2/FN_vtree_multi_function_network_generation.h b/source/blender/functions/FN_vtree_multi_function_network_generation.h
index 7af7c0ced3f..7af7c0ced3f 100644
--- a/source/blender/functions2/FN_vtree_multi_function_network_generation.h
+++ b/source/blender/functions/FN_vtree_multi_function_network_generation.h
diff --git a/source/blender/functions2/intern/attributes_block_container.cc b/source/blender/functions/intern/attributes_block_container.cc
index dd4b7bc3bba..dd4b7bc3bba 100644
--- a/source/blender/functions2/intern/attributes_block_container.cc
+++ b/source/blender/functions/intern/attributes_block_container.cc
diff --git a/source/blender/functions2/intern/attributes_ref.cc b/source/blender/functions/intern/attributes_ref.cc
index a3a6c5e7220..a3a6c5e7220 100644
--- a/source/blender/functions2/intern/attributes_ref.cc
+++ b/source/blender/functions/intern/attributes_ref.cc
diff --git a/source/blender/functions2/intern/cpp_type.cc b/source/blender/functions/intern/cpp_type.cc
index 2e04b405a22..2e04b405a22 100644
--- a/source/blender/functions2/intern/cpp_type.cc
+++ b/source/blender/functions/intern/cpp_type.cc
diff --git a/source/blender/functions2/intern/cpp_types.cc b/source/blender/functions/intern/cpp_types.cc
index a81bb99172b..a81bb99172b 100644
--- a/source/blender/functions2/intern/cpp_types.cc
+++ b/source/blender/functions/intern/cpp_types.cc
diff --git a/source/blender/functions2/intern/cpp_types.h b/source/blender/functions/intern/cpp_types.h
index 34299f20beb..34299f20beb 100644
--- a/source/blender/functions2/intern/cpp_types.h
+++ b/source/blender/functions/intern/cpp_types.h
diff --git a/source/blender/functions2/intern/generic_array_ref.cc b/source/blender/functions/intern/generic_array_ref.cc
index fd6bb80e5c8..fd6bb80e5c8 100644
--- a/source/blender/functions2/intern/generic_array_ref.cc
+++ b/source/blender/functions/intern/generic_array_ref.cc
diff --git a/source/blender/functions2/intern/generic_tuple.cc b/source/blender/functions/intern/generic_tuple.cc
index b7216362f13..b7216362f13 100644
--- a/source/blender/functions2/intern/generic_tuple.cc
+++ b/source/blender/functions/intern/generic_tuple.cc
diff --git a/source/blender/functions2/intern/initialize.cc b/source/blender/functions/intern/initialize.cc
index 61f3214c4b2..61f3214c4b2 100644
--- a/source/blender/functions2/intern/initialize.cc
+++ b/source/blender/functions/intern/initialize.cc
diff --git a/source/blender/functions2/intern/multi_function_common_context_ids.cc b/source/blender/functions/intern/multi_function_common_context_ids.cc
index ab4a920ab8a..ab4a920ab8a 100644
--- a/source/blender/functions2/intern/multi_function_common_context_ids.cc
+++ b/source/blender/functions/intern/multi_function_common_context_ids.cc
diff --git a/source/blender/functions2/intern/multi_function_network.cc b/source/blender/functions/intern/multi_function_network.cc
index 6f98524a0da..6f98524a0da 100644
--- a/source/blender/functions2/intern/multi_function_network.cc
+++ b/source/blender/functions/intern/multi_function_network.cc
diff --git a/source/blender/functions2/intern/multi_functions/lists.cc b/source/blender/functions/intern/multi_functions/lists.cc
index 47571f478db..47571f478db 100644
--- a/source/blender/functions2/intern/multi_functions/lists.cc
+++ b/source/blender/functions/intern/multi_functions/lists.cc
diff --git a/source/blender/functions2/intern/multi_functions/lists.h b/source/blender/functions/intern/multi_functions/lists.h
index 231b480f4ae..231b480f4ae 100644
--- a/source/blender/functions2/intern/multi_functions/lists.h
+++ b/source/blender/functions/intern/multi_functions/lists.h
diff --git a/source/blender/functions2/intern/multi_functions/mixed.cc b/source/blender/functions/intern/multi_functions/mixed.cc
index d4607b8888d..d4607b8888d 100644
--- a/source/blender/functions2/intern/multi_functions/mixed.cc
+++ b/source/blender/functions/intern/multi_functions/mixed.cc
diff --git a/source/blender/functions2/intern/multi_functions/mixed.h b/source/blender/functions/intern/multi_functions/mixed.h
index 610ba378d71..610ba378d71 100644
--- a/source/blender/functions2/intern/multi_functions/mixed.h
+++ b/source/blender/functions/intern/multi_functions/mixed.h
diff --git a/source/blender/functions2/intern/multi_functions/network.cc b/source/blender/functions/intern/multi_functions/network.cc
index 1a15443b5d5..1a15443b5d5 100644
--- a/source/blender/functions2/intern/multi_functions/network.cc
+++ b/source/blender/functions/intern/multi_functions/network.cc
diff --git a/source/blender/functions2/intern/multi_functions/network.h b/source/blender/functions/intern/multi_functions/network.h
index f7fed025724..f7fed025724 100644
--- a/source/blender/functions2/intern/multi_functions/network.h
+++ b/source/blender/functions/intern/multi_functions/network.h
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/builder.cc b/source/blender/functions/intern/vtree_multi_function_network/builder.cc
index a38ecfee28d..a38ecfee28d 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/builder.cc
+++ b/source/blender/functions/intern/vtree_multi_function_network/builder.cc
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/builder.h b/source/blender/functions/intern/vtree_multi_function_network/builder.h
index c06e307b14b..c06e307b14b 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/builder.h
+++ b/source/blender/functions/intern/vtree_multi_function_network/builder.h
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/generate.cc b/source/blender/functions/intern/vtree_multi_function_network/generate.cc
index af9c2cda1dc..af9c2cda1dc 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/generate.cc
+++ b/source/blender/functions/intern/vtree_multi_function_network/generate.cc
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/mappings.cc b/source/blender/functions/intern/vtree_multi_function_network/mappings.cc
index 2575c13bd48..2575c13bd48 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/mappings.cc
+++ b/source/blender/functions/intern/vtree_multi_function_network/mappings.cc
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/mappings.h b/source/blender/functions/intern/vtree_multi_function_network/mappings.h
index 166e039b674..166e039b674 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/mappings.h
+++ b/source/blender/functions/intern/vtree_multi_function_network/mappings.h
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/mappings_nodes.cc b/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
index 4568308c31b..4568308c31b 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/mappings_nodes.cc
+++ b/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/mappings_sockets.cc b/source/blender/functions/intern/vtree_multi_function_network/mappings_sockets.cc
index 1cc93145285..1cc93145285 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/mappings_sockets.cc
+++ b/source/blender/functions/intern/vtree_multi_function_network/mappings_sockets.cc
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index f49dd72d177..f6b98f43029 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -26,7 +26,7 @@ set(INC
   ../blenlib
   ../bmesh
   ../depsgraph
-  ../functions2
+  ../functions
   ../simulations
   ../makesdna
   ../makesrna
@@ -122,7 +122,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
-  bf_functions2
+  bf_functions
   bf_simulations
 )
 
diff --git a/source/blender/simulations/CMakeLists.txt b/source/blender/simulations/CMakeLists.txt
index 95519610c89..131cec47422 100644
--- a/source/blender/simulations/CMakeLists.txt
+++ b/source/blender/simulations/CMakeLists.txt
@@ -5,7 +5,7 @@ set(INC
   ../makesrna
   ../blenkernel
   ../depsgraph
-  ../functions2
+  ../functions
   ../imbuf
   ../../../intern/guardedalloc
 )
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 00f26f6beea..8e3f0cba7fe 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -36,7 +36,7 @@ set(INC
   ../makesdna
   ../makesrna
   ../nodes
-  ../functions2
+  ../functions
   ../render/extern/include
   ../../../intern/clog
   ../../../intern/ghost
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 447c9995a2b..f78a32a6599 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -29,7 +29,7 @@ blender_include_dirs(
   ../blender/blenloader
   ../blender/depsgraph
   ../blender/editors/include
-  ../blender/functions2
+  ../blender/functions
   ../blender/imbuf
   ../blender/makesrna
   ../blender/render/extern/include
@@ -45,7 +45,7 @@ set(LIB
   bf_depsgraph
   bf_dna
   bf_editor_datafiles
-  bf_functions2
+  bf_functions
   bf_imbuf
   bf_intern_clog
   bf_intern_guardedalloc