[Bf-blender-cvs] [1fb8e34c9c2] functions-experimental-refactor: rename functions2 to functions

[Jacques Lucke]

Commit: 1fb8e34c9c2e88444e732e6829590cbd78ecd672
Author: Jacques Lucke
Date:   Thu Nov 7 11:57:35 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rB1fb8e34c9c2e88444e732e6829590cbd78ecd672

rename functions2 to functions

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

M	source/blender/CMakeLists.txt
R096	source/blender/functions2/CMakeLists.txt	source/blender/functions/CMakeLists.txt
R100	source/blender/functions2/FN_attributes_block_container.h	source/blender/functions/FN_attributes_block_container.h
R100	source/blender/functions2/FN_attributes_ref.h	source/blender/functions/FN_attributes_ref.h
R100	source/blender/functions2/FN_cpp_type.h	source/blender/functions/FN_cpp_type.h
R100	source/blender/functions2/FN_generic_array_ref.h	source/blender/functions/FN_generic_array_ref.h
R100	source/blender/functions2/FN_generic_tuple.h	source/blender/functions/FN_generic_tuple.h
R100	source/blender/functions2/FN_generic_vector_array.h	source/blender/functions/FN_generic_vector_array.h
R100	source/blender/functions2/FN_generic_virtual_list_list_ref.h	source/blender/functions/FN_generic_virtual_list_list_ref.h
R100	source/blender/functions2/FN_generic_virtual_list_ref.h	source/blender/functions/FN_generic_virtual_list_ref.h
R100	source/blender/functions2/FN_initialize.h	source/blender/functions/FN_initialize.h
R100	source/blender/functions2/FN_multi_function.h	source/blender/functions/FN_multi_function.h
R100	source/blender/functions2/FN_multi_function_common_context_ids.h	source/blender/functions/FN_multi_function_common_context_ids.h
R100	source/blender/functions2/FN_multi_function_context.h	source/blender/functions/FN_multi_function_context.h
R100	source/blender/functions2/FN_multi_function_data_type.h	source/blender/functions/FN_multi_function_data_type.h
R100	source/blender/functions2/FN_multi_function_mask.h	source/blender/functions/FN_multi_function_mask.h
R100	source/blender/functions2/FN_multi_function_network.h	source/blender/functions/FN_multi_function_network.h
R100	source/blender/functions2/FN_multi_function_param_type.h	source/blender/functions/FN_multi_function_param_type.h
R100	source/blender/functions2/FN_multi_functions.h	source/blender/functions/FN_multi_functions.h
R100	source/blender/functions2/FN_vtree_multi_function_network.h	source/blender/functions/FN_vtree_multi_function_network.h
R100	source/blender/functions2/FN_vtree_multi_function_network_generation.h	source/blender/functions/FN_vtree_multi_function_network_generation.h
R100	source/blender/functions2/intern/attributes_block_container.cc	source/blender/functions/intern/attributes_block_container.cc
R100	source/blender/functions2/intern/attributes_ref.cc	source/blender/functions/intern/attributes_ref.cc
R100	source/blender/functions2/intern/cpp_type.cc	source/blender/functions/intern/cpp_type.cc
R100	source/blender/functions2/intern/cpp_types.cc	source/blender/functions/intern/cpp_types.cc
R100	source/blender/functions2/intern/cpp_types.h	source/blender/functions/intern/cpp_types.h
R100	source/blender/functions2/intern/generic_array_ref.cc	source/blender/functions/intern/generic_array_ref.cc
R100	source/blender/functions2/intern/generic_tuple.cc	source/blender/functions/intern/generic_tuple.cc
R100	source/blender/functions2/intern/initialize.cc	source/blender/functions/intern/initialize.cc
R100	source/blender/functions2/intern/multi_function_common_context_ids.cc	source/blender/functions/intern/multi_function_common_context_ids.cc
R100	source/blender/functions2/intern/multi_function_network.cc	source/blender/functions/intern/multi_function_network.cc
R100	source/blender/functions2/intern/multi_functions/lists.cc	source/blender/functions/intern/multi_functions/lists.cc
R100	source/blender/functions2/intern/multi_functions/lists.h	source/blender/functions/intern/multi_functions/lists.h
R100	source/blender/functions2/intern/multi_functions/mixed.cc	source/blender/functions/intern/multi_functions/mixed.cc
R100	source/blender/functions2/intern/multi_functions/mixed.h	source/blender/functions/intern/multi_functions/mixed.h
R100	source/blender/functions2/intern/multi_functions/network.cc	source/blender/functions/intern/multi_functions/network.cc
R100	source/blender/functions2/intern/multi_functions/network.h	source/blender/functions/intern/multi_functions/network.h
R100	source/blender/functions2/intern/vtree_multi_function_network/builder.cc	source/blender/functions/intern/vtree_multi_function_network/builder.cc
R100	source/blender/functions2/intern/vtree_multi_function_network/builder.h	source/blender/functions/intern/vtree_multi_function_network/builder.h
R100	source/blender/functions2/intern/vtree_multi_function_network/generate.cc	source/blender/functions/intern/vtree_multi_function_network/generate.cc
R100	source/blender/functions2/intern/vtree_multi_function_network/mappings.cc	source/blender/functions/intern/vtree_multi_function_network/mappings.cc
R100	source/blender/functions2/intern/vtree_multi_function_network/mappings.h	source/blender/functions/intern/vtree_multi_function_network/mappings.h
R100	source/blender/functions2/intern/vtree_multi_function_network/mappings_nodes.cc	source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
R100	source/blender/functions2/intern/vtree_multi_function_network/mappings_sockets.cc	source/blender/functions/intern/vtree_multi_function_network/mappings_sockets.cc
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/simulations/CMakeLists.txt
M	source/blender/windowmanager/CMakeLists.txt
M	source/creator/CMakeLists.txt

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

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
similarity index 96%
rename from source/blender/functions2/CMakeLists.txt
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_attributes_block_container.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_attributes_ref.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_cpp_type.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_generic_array_ref.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_generic_tuple.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_generic_vector_array.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_generic_virtual_list_list_ref.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_generic_virtual_list_ref.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_initialize.h
rename to source/blender/functions/FN_initialize.h
diff --git a/source/blender/functions2/FN_multi_function.h b/source/blender/functions/FN_multi_function.h
similarity index 100%
rename from source/blender/functions2/FN_multi_function.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_multi_function_common_context_ids.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_multi_function_context.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_multi_function_data_type.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_multi_function_mask.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_multi_function_network.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_multi_function_param_type.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_multi_functions.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_vtree_multi_function_network.h
rename to 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
similarity index 100%
rename from source/blender/functions2/FN_vtree_multi_function_network_generation.h
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/attributes_block_container.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/attributes_ref.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/cpp_type.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/cpp_types.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/cpp_types.h
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/generic_array_ref.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/generic_tuple.cc
rename to source/blender/functions/intern/generic_tuple.cc
diff --git a/source/blender/functions2/intern/initialize.cc b/source/blender/functions/intern/initialize.cc
similarity index 100%
rename from source/blender/functions2/intern/initialize.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/multi_function_common_context_ids.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/multi_function_network.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/multi_functions/lists.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/multi_functions/lists.h
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/multi_functions/mixed.cc
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/multi_functions/mixed.h
rename to 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
similarity index 100%
rename from source/blender/functions2/intern/multi_functions/network.cc
rename to source/blender/functions/intern/

@@ Diff output truncated at 10240 characters. @@