[Bf-blender-cvs] [d9356a5b8df] functions: Cleanup: make format after SortedIncludes

Jacques Lucke noreply at git.blender.org
Thu Mar 19 11:28:20 CET 2020 

Commit: d9356a5b8dfc9d63ffddc015c9e8a81db2a88b7e
Author: Jacques Lucke
Date:   Thu Mar 19 11:22:15 2020 +0100
Branches: functions
https://developer.blender.org/rBd9356a5b8dfc9d63ffddc015c9e8a81db2a88b7e

Cleanup: make format after SortedIncludes

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

M	source/blender/blenkernel/BKE_id_data_cache.h
M	source/blender/blenkernel/BKE_surface_hook.h
M	source/blender/blenkernel/BKE_virtual_node_tree.h
M	source/blender/blenkernel/intern/id_handle.cc
M	source/blender/blenlib/BLI_color.h
M	source/blender/blenlib/BLI_dot_export.h
M	source/blender/blenlib/BLI_linear_allocated_vector.h
M	source/blender/blenlib/BLI_linear_allocator.h
M	source/blender/blenlib/BLI_multi_map.h
M	source/blender/blenlib/BLI_resource_collector.h
M	source/blender/blenlib/BLI_string_multi_map.h
M	source/blender/blenlib/intern/math_base_inline.c
M	source/blender/functions/FN_attributes_ref.h
M	source/blender/functions/FN_cpp_type.h
M	source/blender/functions/FN_multi_function.h
M	source/blender/functions/FN_multi_function_common_contexts.h
M	source/blender/functions/FN_multi_function_context.h
M	source/blender/functions/FN_multi_function_dependencies.h
M	source/blender/functions/FN_multi_function_network.h
M	source/blender/functions/FN_multi_functions.h
M	source/blender/functions/FN_node_tree.h
M	source/blender/functions/FN_node_tree_multi_function_network.h
M	source/blender/functions/FN_node_tree_multi_function_network_generation.h
M	source/blender/functions/intern/cpp_types.cc
M	source/blender/functions/intern/initialize.cc
M	source/blender/functions/intern/multi_function_network.cc
M	source/blender/functions/intern/multi_function_network_optimization.cc
M	source/blender/functions/intern/multi_functions/constants.h
M	source/blender/functions/intern/multi_functions/mixed.cc
M	source/blender/functions/intern/multi_functions/particles.cc
M	source/blender/functions/intern/multi_functions/surface_hook.cc
M	source/blender/functions/intern/node_tree.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.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_bparticles.c
M	source/blender/modifiers/intern/MOD_bparticles_output.c
M	source/blender/modifiers/intern/MOD_functiondeform.c
M	source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
M	source/blender/modifiers/intern/MOD_functionpoints.c
M	source/blender/modifiers/intern/MOD_functionpoints_cxx.cc
M	source/blender/simulations/bparticles/block_step_data.hpp
M	source/blender/simulations/bparticles/c_wrapper.cpp
M	source/blender/simulations/bparticles/emitters.cpp
M	source/blender/simulations/bparticles/emitters.hpp
M	source/blender/simulations/bparticles/events.cpp
M	source/blender/simulations/bparticles/node_frontend.cpp
M	source/blender/simulations/bparticles/node_frontend.hpp
M	source/blender/simulations/bparticles/offset_handlers.hpp
M	source/blender/simulations/bparticles/particle_action.hpp
M	source/blender/simulations/bparticles/particle_function.hpp
M	source/blender/simulations/bparticles/simulate.cpp
M	source/blender/simulations/bparticles/simulate.hpp
M	source/blender/simulations/bparticles/world_state.hpp
M	tests/gtests/blenlib/BLI_linear_allocator_test.cc
M	tests/gtests/blenlib/BLI_multi_map_test.cc
M	tests/gtests/blenlib/BLI_stack_cpp_test.cc
M	tests/gtests/blenlib/BLI_vector_adaptor_test.cc
M	tests/gtests/blenlib/BLI_virtual_list_list_ref_test.cc
M	tests/gtests/blenlib/BLI_virtual_list_ref_test.cc

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

diff --git a/source/blender/blenkernel/BKE_id_data_cache.h b/source/blender/blenkernel/BKE_id_data_cache.h
index fc952c96b38..12966f8ada3 100644
--- a/source/blender/blenkernel/BKE_id_data_cache.h
+++ b/source/blender/blenkernel/BKE_id_data_cache.h
@@ -3,9 +3,9 @@
 
 #include <mutex>
 
-#include "BLI_map.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_kdtree.h"
+#include "BLI_map.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
diff --git a/source/blender/blenkernel/BKE_surface_hook.h b/source/blender/blenkernel/BKE_surface_hook.h
index 2ca5f9f6238..d1f7e19c674 100644
--- a/source/blender/blenkernel/BKE_surface_hook.h
+++ b/source/blender/blenkernel/BKE_surface_hook.h
@@ -1,8 +1,8 @@
 #ifndef __BKE_SURFACE_HOOK_H__
 #define __BKE_SURFACE_HOOK_H__
 
-#include "BLI_utildefines.h"
 #include "BLI_float3.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_id_handle.h"
 
diff --git a/source/blender/blenkernel/BKE_virtual_node_tree.h b/source/blender/blenkernel/BKE_virtual_node_tree.h
index 86d96e569f6..98df55de980 100644
--- a/source/blender/blenkernel/BKE_virtual_node_tree.h
+++ b/source/blender/blenkernel/BKE_virtual_node_tree.h
@@ -1,14 +1,14 @@
 #ifndef __BKE_VIRTUAL_NODE_TREE_H__
 #define __BKE_VIRTUAL_NODE_TREE_H__
 
-#include "BLI_vector.h"
-#include "BLI_utility_mixins.h"
 #include "BLI_array_cxx.h"
-#include "BLI_string_ref.h"
-#include "BLI_string_map.h"
+#include "BLI_linear_allocated_vector.h"
 #include "BLI_resource_collector.h"
+#include "BLI_string_map.h"
 #include "BLI_string_multi_map.h"
-#include "BLI_linear_allocated_vector.h"
+#include "BLI_string_ref.h"
+#include "BLI_utility_mixins.h"
+#include "BLI_vector.h"
 
 #include "DNA_node_types.h"
 
diff --git a/source/blender/blenkernel/intern/id_handle.cc b/source/blender/blenkernel/intern/id_handle.cc
index ddef61cb0b1..4e1c06a022e 100644
--- a/source/blender/blenkernel/intern/id_handle.cc
+++ b/source/blender/blenkernel/intern/id_handle.cc
@@ -1,11 +1,11 @@
-#include "BLI_utildefines.h"
 #include "BLI_hash.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_id_handle.h"
 
 #include "DNA_ID.h"
-#include "DNA_object_types.h"
 #include "DNA_image_types.h"
+#include "DNA_object_types.h"
 
 namespace BKE {
 
diff --git a/source/blender/blenlib/BLI_color.h b/source/blender/blenlib/BLI_color.h
index d745c7ebbee..354312efca8 100644
--- a/source/blender/blenlib/BLI_color.h
+++ b/source/blender/blenlib/BLI_color.h
@@ -17,6 +17,9 @@
 #ifndef __BLI_COLOR_H__
 #define __BLI_COLOR_H__
 
+#include <array>
+#include <iostream>
+
 #include "BLI_math_color.h"
 
 namespace BLI {
diff --git a/source/blender/blenlib/BLI_dot_export.h b/source/blender/blenlib/BLI_dot_export.h
index 74a31b8b42a..4ad430f88ff 100644
--- a/source/blender/blenlib/BLI_dot_export.h
+++ b/source/blender/blenlib/BLI_dot_export.h
@@ -8,12 +8,12 @@
  * Preview: https://dreampuf.github.io/GraphvizOnline
  */
 
-#include "BLI_vector.h"
-#include "BLI_optional.h"
-#include "BLI_string_map.h"
 #include "BLI_map.h"
+#include "BLI_optional.h"
 #include "BLI_set.h"
+#include "BLI_string_map.h"
 #include "BLI_utility_mixins.h"
+#include "BLI_vector.h"
 
 #include "BLI_dot_export_attribute_enums.h"
 
diff --git a/source/blender/blenlib/BLI_linear_allocated_vector.h b/source/blender/blenlib/BLI_linear_allocated_vector.h
index a70f83c98fb..d5d19b9975f 100644
--- a/source/blender/blenlib/BLI_linear_allocated_vector.h
+++ b/source/blender/blenlib/BLI_linear_allocated_vector.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "BLI_index_range.h"
 #include "BLI_linear_allocator.h"
 #include "BLI_memory_utils_cxx.h"
-#include "BLI_index_range.h"
 
 namespace BLI {
 
diff --git a/source/blender/blenlib/BLI_linear_allocator.h b/source/blender/blenlib/BLI_linear_allocator.h
index 6aa3e896559..f723ff470b2 100644
--- a/source/blender/blenlib/BLI_linear_allocator.h
+++ b/source/blender/blenlib/BLI_linear_allocator.h
@@ -24,11 +24,11 @@
 
 #pragma once
 
-#include "BLI_vector.h"
-#include "BLI_utility_mixins.h"
-#include "BLI_timeit.h"
 #include "BLI_stack_cxx.h"
 #include "BLI_string_ref.h"
+#include "BLI_timeit.h"
+#include "BLI_utility_mixins.h"
+#include "BLI_vector.h"
 
 namespace BLI {
 
diff --git a/source/blender/blenlib/BLI_multi_map.h b/source/blender/blenlib/BLI_multi_map.h
index b770dfbab6c..71867e0f5da 100644
--- a/source/blender/blenlib/BLI_multi_map.h
+++ b/source/blender/blenlib/BLI_multi_map.h
@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "BLI_map.h"
 #include "BLI_array_ref.h"
-#include "BLI_vector.h"
 #include "BLI_linear_allocator.h"
+#include "BLI_map.h"
+#include "BLI_vector.h"
 
 namespace BLI {
 
diff --git a/source/blender/blenlib/BLI_resource_collector.h b/source/blender/blenlib/BLI_resource_collector.h
index aaae164bb4b..ccfa25499e2 100644
--- a/source/blender/blenlib/BLI_resource_collector.h
+++ b/source/blender/blenlib/BLI_resource_collector.h
@@ -1,10 +1,10 @@
 #ifndef __BLI_OWNED_RESOURCES_H__
 #define __BLI_OWNED_RESOURCES_H__
 
-#include "BLI_vector.h"
-#include "BLI_utility_mixins.h"
-#include "BLI_string_ref.h"
 #include "BLI_linear_allocator.h"
+#include "BLI_string_ref.h"
+#include "BLI_utility_mixins.h"
+#include "BLI_vector.h"
 
 namespace BLI {
 
diff --git a/source/blender/blenlib/BLI_string_multi_map.h b/source/blender/blenlib/BLI_string_multi_map.h
index 4eed3b00978..6ccfdcdb0ad 100644
--- a/source/blender/blenlib/BLI_string_multi_map.h
+++ b/source/blender/blenlib/BLI_string_multi_map.h
@@ -1,8 +1,8 @@
 #ifndef __BLI_STRING_MULTI_MAP_H__
 #define __BLI_STRING_MULTI_MAP_H__
 
-#include "BLI_string_ref.h"
 #include "BLI_string_map.h"
+#include "BLI_string_ref.h"
 #include "BLI_vector.h"
 
 namespace BLI {
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c
index c8e9f09a018..c4b68e9164c 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -249,7 +249,6 @@ MINLINE unsigned int log2_ceil_u(unsigned int x)
   }
 }
 
-
 /* rounding and clamping */
 
 #define _round_clamp_fl_impl(arg, ty, min, max) \
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_vect

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list