Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-03-19 13:22:15 +0300
committerJacques Lucke <jacques@blender.org>2020-03-19 13:22:15 +0300
commitd9356a5b8dfc9d63ffddc015c9e8a81db2a88b7e (patch)
tree00491295c7afc207c4e8166f2e808bffcf70bb4c /source/blender/functions
parentedd0928d09c1f5e8aff662916c05806348ecaa82 (diff)
Cleanup: make format after SortedIncludes
Diffstat (limited to 'source/blender/functions')
-rw-r--r--source/blender/functions/FN_attributes_ref.h6
-rw-r--r--source/blender/functions/FN_cpp_type.h2
-rw-r--r--source/blender/functions/FN_multi_function.h6
-rw-r--r--source/blender/functions/FN_multi_function_common_contexts.h2
-rw-r--r--source/blender/functions/FN_multi_function_context.h10
-rw-r--r--source/blender/functions/FN_multi_function_dependencies.h2
-rw-r--r--source/blender/functions/FN_multi_function_network.h6
-rw-r--r--source/blender/functions/FN_multi_functions.h2
-rw-r--r--source/blender/functions/FN_node_tree.h2
-rw-r--r--source/blender/functions/FN_node_tree_multi_function_network.h2
-rw-r--r--source/blender/functions/FN_node_tree_multi_function_network_generation.h2
-rw-r--r--source/blender/functions/intern/cpp_types.cc4
-rw-r--r--source/blender/functions/intern/initialize.cc2
-rw-r--r--source/blender/functions/intern/multi_function_network.cc2
-rw-r--r--source/blender/functions/intern/multi_function_network_optimization.cc2
-rw-r--r--source/blender/functions/intern/multi_functions/constants.h2
-rw-r--r--source/blender/functions/intern/multi_functions/mixed.cc18
-rw-r--r--source/blender/functions/intern/multi_functions/particles.cc2
-rw-r--r--source/blender/functions/intern/multi_functions/surface_hook.cc16
-rw-r--r--source/blender/functions/intern/node_tree.cc2
-rw-r--r--source/blender/functions/intern/node_tree_multi_function_network/builder.h2
-rw-r--r--source/blender/functions/intern/node_tree_multi_function_network/generate.cc6
-rw-r--r--source/blender/functions/intern/node_tree_multi_function_network/mappings.h2
-rw-r--r--source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc2
-rw-r--r--source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc4
25 files changed, 54 insertions, 54 deletions
diff --git a/source/blender/functions/FN_attributes_ref.h b/source/blender/functions/FN_attributes_ref.h
index 4a51ea3fec9..812b0e26a6a 100644
--- a/source/blender/functions/FN_attributes_ref.h
+++ b/source/blender/functions/FN_attributes_ref.h
@@ -5,11 +5,11 @@
#include "FN_generic_array_ref.h"
#include "BLI_array_cxx.h"
+#include "BLI_linear_allocator.h"
+#include "BLI_optional.h"
+#include "BLI_string_map.h"
#include "BLI_vector.h"
#include "BLI_vector_set.h"
-#include "BLI_string_map.h"
-#include "BLI_optional.h"
-#include "BLI_linear_allocator.h"
namespace FN {
diff --git a/source/blender/functions/FN_cpp_type.h b/source/blender/functions/FN_cpp_type.h
index 364d1def54e..35dafa8f632 100644
--- a/source/blender/functions/FN_cpp_type.h
+++ b/source/blender/functions/FN_cpp_type.h
@@ -1,10 +1,10 @@
#ifndef __FN_CPP_TYPE_H__
#define __FN_CPP_TYPE_H__
+#include "BLI_index_mask.h"
#include "BLI_string_ref.h"
#include "BLI_utility_mixins.h"
#include "BLI_vector.h"
-#include "BLI_index_mask.h"
namespace FN {
diff --git a/source/blender/functions/FN_multi_function.h b/source/blender/functions/FN_multi_function.h
index 1283fed8695..6a3c36ee70b 100644
--- a/source/blender/functions/FN_multi_function.h
+++ b/source/blender/functions/FN_multi_function.h
@@ -1,16 +1,16 @@
#ifndef __FN_MULTI_FUNCTION_H__
#define __FN_MULTI_FUNCTION_H__
-#include <typeinfo>
#include <memory>
+#include <typeinfo>
#include "FN_generic_array_ref.h"
#include "FN_generic_vector_array.h"
-#include "FN_generic_virtual_list_ref.h"
#include "FN_generic_virtual_list_list_ref.h"
+#include "FN_generic_virtual_list_ref.h"
+#include "FN_multi_function_context.h"
#include "FN_multi_function_data_type.h"
#include "FN_multi_function_param_type.h"
-#include "FN_multi_function_context.h"
#include "BLI_vector.h"
diff --git a/source/blender/functions/FN_multi_function_common_contexts.h b/source/blender/functions/FN_multi_function_common_contexts.h
index 007bbb95fd0..0b689ab08d5 100644
--- a/source/blender/functions/FN_multi_function_common_contexts.h
+++ b/source/blender/functions/FN_multi_function_common_contexts.h
@@ -3,8 +3,8 @@
#include <mutex>
-#include "FN_multi_function_context.h"
#include "FN_attributes_ref.h"
+#include "FN_multi_function_context.h"
#include "BLI_float3.h"
#include "BLI_map.h"
diff --git a/source/blender/functions/FN_multi_function_context.h b/source/blender/functions/FN_multi_function_context.h
index 0bbd8c02e05..7d6e4fa06b1 100644
--- a/source/blender/functions/FN_multi_function_context.h
+++ b/source/blender/functions/FN_multi_function_context.h
@@ -1,13 +1,13 @@
#ifndef __FN_MULTI_FUNCTION_CONTEXT_H__
#define __FN_MULTI_FUNCTION_CONTEXT_H__
-#include "BLI_optional.h"
-#include "BLI_virtual_list_ref.h"
-#include "BLI_vector.h"
-#include "BLI_utility_mixins.h"
+#include "BLI_buffer_cache.h"
#include "BLI_index_range.h"
+#include "BLI_optional.h"
#include "BLI_static_class_ids.h"
-#include "BLI_buffer_cache.h"
+#include "BLI_utility_mixins.h"
+#include "BLI_vector.h"
+#include "BLI_virtual_list_ref.h"
#include "BKE_id_handle.h"
diff --git a/source/blender/functions/FN_multi_function_dependencies.h b/source/blender/functions/FN_multi_function_dependencies.h
index c73b3a03378..b056dbafad6 100644
--- a/source/blender/functions/FN_multi_function_dependencies.h
+++ b/source/blender/functions/FN_multi_function_dependencies.h
@@ -3,8 +3,8 @@
#include "BLI_set.h"
-#include "DNA_object_types.h"
#include "DNA_image_types.h"
+#include "DNA_object_types.h"
#include "FN_node_tree.h"
diff --git a/source/blender/functions/FN_multi_function_network.h b/source/blender/functions/FN_multi_function_network.h
index 810fbb6340b..18cc4a603e4 100644
--- a/source/blender/functions/FN_multi_function_network.h
+++ b/source/blender/functions/FN_multi_function_network.h
@@ -3,12 +3,12 @@
#include "FN_multi_function.h"
-#include "BLI_optional.h"
#include "BLI_array_cxx.h"
+#include "BLI_linear_allocated_vector.h"
+#include "BLI_map.h"
+#include "BLI_optional.h"
#include "BLI_set.h"
#include "BLI_vector_set.h"
-#include "BLI_map.h"
-#include "BLI_linear_allocated_vector.h"
namespace FN {
diff --git a/source/blender/functions/FN_multi_functions.h b/source/blender/functions/FN_multi_functions.h
index ff59767f518..7312be67d41 100644
--- a/source/blender/functions/FN_multi_functions.h
+++ b/source/blender/functions/FN_multi_functions.h
@@ -3,12 +3,12 @@
#include "intern/multi_functions/constants.h"
#include "intern/multi_functions/customizable.h"
+#include "intern/multi_functions/global_functions.h"
#include "intern/multi_functions/lists.h"
#include "intern/multi_functions/mixed.h"
#include "intern/multi_functions/network.h"
#include "intern/multi_functions/particles.h"
#include "intern/multi_functions/surface_hook.h"
#include "intern/multi_functions/vectorize.h"
-#include "intern/multi_functions/global_functions.h"
#endif /* __FN_MULTI_FUNCTIONS_H__ */
diff --git a/source/blender/functions/FN_node_tree.h b/source/blender/functions/FN_node_tree.h
index 563e664a060..fd7f21bba3b 100644
--- a/source/blender/functions/FN_node_tree.h
+++ b/source/blender/functions/FN_node_tree.h
@@ -3,9 +3,9 @@
#include "BKE_virtual_node_tree.h"
+#include "BLI_linear_allocated_vector.h"
#include "BLI_map.h"
#include "BLI_multi_map.h"
-#include "BLI_linear_allocated_vector.h"
namespace FN {
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 d528f56f92b..54c4bb69b38 100644
--- a/source/blender/functions/FN_node_tree_multi_function_network.h
+++ b/source/blender/functions/FN_node_tree_multi_function_network.h
@@ -3,8 +3,8 @@
#include "FN_node_tree.h"
-#include "BLI_multi_map.h"
#include "BLI_index_to_ref_map.h"
+#include "BLI_multi_map.h"
#include "FN_multi_function_network.h"
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 9173b9d40b0..b45e7f6f84e 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
@@ -1,8 +1,8 @@
#ifndef __FN_VTREE_MULTI_FUNCTION_NETWORK_GENERATION_H__
#define __FN_VTREE_MULTI_FUNCTION_NETWORK_GENERATION_H__
-#include "FN_node_tree_multi_function_network.h"
#include "BLI_resource_collector.h"
+#include "FN_node_tree_multi_function_network.h"
#include "intern/multi_functions/network.h"
namespace FN {
diff --git a/source/blender/functions/intern/cpp_types.cc b/source/blender/functions/intern/cpp_types.cc
index f3e15559777..c6d63994f27 100644
--- a/source/blender/functions/intern/cpp_types.cc
+++ b/source/blender/functions/intern/cpp_types.cc
@@ -1,8 +1,8 @@
-#include "FN_cpp_type.h"
#include "cpp_types.h"
+#include "FN_cpp_type.h"
-#include "BLI_float3.h"
#include "BLI_color.h"
+#include "BLI_float3.h"
#include "BLI_rand_cxx.h"
#include "BKE_surface_hook.h"
diff --git a/source/blender/functions/intern/initialize.cc b/source/blender/functions/intern/initialize.cc
index f079aaa7837..7361f4f55d0 100644
--- a/source/blender/functions/intern/initialize.cc
+++ b/source/blender/functions/intern/initialize.cc
@@ -1,7 +1,7 @@
#include "FN_initialize.h"
#include "cpp_types.h"
-#include "node_tree_multi_function_network/mappings.h"
#include "multi_functions/global_functions.h"
+#include "node_tree_multi_function_network/mappings.h"
void FN_initialize(void)
{
diff --git a/source/blender/functions/intern/multi_function_network.cc b/source/blender/functions/intern/multi_function_network.cc
index 77f478a24b8..71620ec3e1f 100644
--- a/source/blender/functions/intern/multi_function_network.cc
+++ b/source/blender/functions/intern/multi_function_network.cc
@@ -2,9 +2,9 @@
#include "FN_multi_function_network.h"
+#include "BLI_dot_export.h"
#include "BLI_set.h"
#include "BLI_stack_cxx.h"
-#include "BLI_dot_export.h"
extern "C" {
void WM_clipboard_text_set(const char *buf, bool selection);
diff --git a/source/blender/functions/intern/multi_function_network_optimization.cc b/source/blender/functions/intern/multi_function_network_optimization.cc
index 6713a4146a0..380a65e7ecf 100644
--- a/source/blender/functions/intern/multi_function_network_optimization.cc
+++ b/source/blender/functions/intern/multi_function_network_optimization.cc
@@ -2,10 +2,10 @@
#include "FN_multi_function_network_optimization.h"
#include "FN_multi_functions.h"
-#include "BLI_stack_cxx.h"
#include "BLI_multi_map.h"
#include "BLI_rand.h"
#include "BLI_rand_cxx.h"
+#include "BLI_stack_cxx.h"
namespace FN {
diff --git a/source/blender/functions/intern/multi_functions/constants.h b/source/blender/functions/intern/multi_functions/constants.h
index 1095c9442da..257e0012b3c 100644
--- a/source/blender/functions/intern/multi_functions/constants.h
+++ b/source/blender/functions/intern/multi_functions/constants.h
@@ -4,9 +4,9 @@
#include <sstream>
+#include "BLI_float3.h"
#include "BLI_hash.h"
#include "BLI_rand_cxx.h"
-#include "BLI_float3.h"
namespace FN {
diff --git a/source/blender/functions/intern/multi_functions/mixed.cc b/source/blender/functions/intern/multi_functions/mixed.cc
index 84a8068df5f..590193b5aab 100644
--- a/source/blender/functions/intern/multi_functions/mixed.cc
+++ b/source/blender/functions/intern/multi_functions/mixed.cc
@@ -4,29 +4,29 @@
#include "FN_generic_vector_array.h"
#include "FN_multi_function_common_contexts.h"
-#include "BLI_string_map.h"
#include "BLI_array_cxx.h"
-#include "BLI_noise.h"
+#include "BLI_color.h"
+#include "BLI_float3.h"
+#include "BLI_float4x4.h"
#include "BLI_hash.h"
-#include "BLI_rand.h"
#include "BLI_kdtree.h"
+#include "BLI_noise.h"
+#include "BLI_rand.h"
#include "BLI_rand_cxx.h"
-#include "BLI_float3.h"
-#include "BLI_float4x4.h"
-#include "BLI_color.h"
+#include "BLI_string_map.h"
-#include "DNA_object_types.h"
+#include "DNA_customdata_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_customdata_types.h"
+#include "DNA_object_types.h"
#include "IMB_imbuf_types.h"
#include "BKE_customdata.h"
-#include "BKE_mesh_runtime.h"
#include "BKE_deform.h"
#include "BKE_id_data_cache.h"
+#include "BKE_mesh_runtime.h"
namespace FN {
diff --git a/source/blender/functions/intern/multi_functions/particles.cc b/source/blender/functions/intern/multi_functions/particles.cc
index 43a85dbeda1..820e49d9274 100644
--- a/source/blender/functions/intern/multi_functions/particles.cc
+++ b/source/blender/functions/intern/multi_functions/particles.cc
@@ -1,8 +1,8 @@
#include "particles.h"
#include "util.h"
-#include "FN_multi_function_common_contexts.h"
#include "BLI_rand_cxx.h"
+#include "FN_multi_function_common_contexts.h"
namespace FN {
diff --git a/source/blender/functions/intern/multi_functions/surface_hook.cc b/source/blender/functions/intern/multi_functions/surface_hook.cc
index 3b22a556a1a..f53e522ba84 100644
--- a/source/blender/functions/intern/multi_functions/surface_hook.cc
+++ b/source/blender/functions/intern/multi_functions/surface_hook.cc
@@ -1,26 +1,26 @@
#include "surface_hook.h"
-#include "BKE_surface_hook.h"
-#include "BKE_id_handle.h"
-#include "BKE_id_data_cache.h"
-#include "BKE_mesh_runtime.h"
-#include "BKE_deform.h"
#include "BKE_customdata.h"
+#include "BKE_deform.h"
+#include "BKE_id_data_cache.h"
+#include "BKE_id_handle.h"
#include "BKE_image.h"
+#include "BKE_mesh_runtime.h"
+#include "BKE_surface_hook.h"
#include "IMB_imbuf_types.h"
#include "DNA_customdata_types.h"
+#include "BLI_array_cxx.h"
+#include "BLI_color.h"
#include "BLI_float2.h"
#include "BLI_float3.h"
#include "BLI_float4x4.h"
-#include "BLI_color.h"
-#include "BLI_array_cxx.h"
#include "BLI_vector_adaptor.h"
-#include "util.h"
#include "sampling_util.h"
+#include "util.h"
namespace FN {
diff --git a/source/blender/functions/intern/node_tree.cc b/source/blender/functions/intern/node_tree.cc
index 75517784ea0..f4f2528f2b7 100644
--- a/source/blender/functions/intern/node_tree.cc
+++ b/source/blender/functions/intern/node_tree.cc
@@ -1,7 +1,7 @@
#include "FN_node_tree.h"
-#include "BLI_string.h"
#include "BLI_dot_export.h"
+#include "BLI_string.h"
extern "C" {
void WM_clipboard_text_set(const char *buf, bool selection);
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 6c22beb6280..5472e1e84a5 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
@@ -1,7 +1,7 @@
#pragma once
-#include "FN_node_tree_multi_function_network.h"
#include "FN_multi_functions.h"
+#include "FN_node_tree_multi_function_network.h"
#include "BLI_multi_map.h"
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 23413bb3516..1c7258c9daa 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
@@ -1,12 +1,12 @@
-#include "FN_node_tree_multi_function_network_generation.h"
#include "FN_multi_function_network_optimization.h"
#include "FN_multi_functions.h"
+#include "FN_node_tree_multi_function_network_generation.h"
-#include "BLI_string_map.h"
#include "BLI_string.h"
+#include "BLI_string_map.h"
-#include "mappings.h"
#include "builder.h"
+#include "mappings.h"
namespace FN {
namespace MFGeneration {
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 1eaec2a467d..7941f706def 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
@@ -1,8 +1,8 @@
#pragma once
#include "BLI_map.h"
-#include "BLI_string_map.h"
#include "BLI_resource_collector.h"
+#include "BLI_string_map.h"
#include "FN_node_tree_multi_function_network.h"
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 6d631c88402..468d513e853 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
@@ -1,5 +1,5 @@
-#include "mappings.h"
#include "builder.h"
+#include "mappings.h"
#include "FN_multi_functions.h"
#include "FN_node_tree_multi_function_network_generation.h"
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 acec11e2e95..23d4f6d305a 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
@@ -1,8 +1,8 @@
-#include "mappings.h"
#include "builder.h"
+#include "mappings.h"
-#include "BLI_float3.h"
#include "BLI_color.h"
+#include "BLI_float3.h"
#include "BKE_surface_hook.h"