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/simulations
parentedd0928d09c1f5e8aff662916c05806348ecaa82 (diff)
Cleanup: make format after SortedIncludes
Diffstat (limited to 'source/blender/simulations')
-rw-r--r--source/blender/simulations/bparticles/block_step_data.hpp2
-rw-r--r--source/blender/simulations/bparticles/c_wrapper.cpp12
-rw-r--r--source/blender/simulations/bparticles/emitters.cpp4
-rw-r--r--source/blender/simulations/bparticles/emitters.hpp4
-rw-r--r--source/blender/simulations/bparticles/events.cpp2
-rw-r--r--source/blender/simulations/bparticles/node_frontend.cpp24
-rw-r--r--source/blender/simulations/bparticles/node_frontend.hpp2
-rw-r--r--source/blender/simulations/bparticles/offset_handlers.hpp2
-rw-r--r--source/blender/simulations/bparticles/particle_action.hpp4
-rw-r--r--source/blender/simulations/bparticles/particle_function.hpp2
-rw-r--r--source/blender/simulations/bparticles/simulate.cpp4
-rw-r--r--source/blender/simulations/bparticles/simulate.hpp6
-rw-r--r--source/blender/simulations/bparticles/world_state.hpp6
13 files changed, 37 insertions, 37 deletions
diff --git a/source/blender/simulations/bparticles/block_step_data.hpp b/source/blender/simulations/bparticles/block_step_data.hpp
index d89cb60fae5..bcf196c5d09 100644
--- a/source/blender/simulations/bparticles/block_step_data.hpp
+++ b/source/blender/simulations/bparticles/block_step_data.hpp
@@ -2,8 +2,8 @@
#include "FN_attributes_ref.h"
-#include "BLI_float_interval.h"
#include "BLI_buffer_cache.h"
+#include "BLI_float_interval.h"
#include "simulation_state.hpp"
diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp b/source/blender/simulations/bparticles/c_wrapper.cpp
index 9600a1ac9a6..84d8255d535 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -1,16 +1,16 @@
#include "BParticles.h"
+#include "node_frontend.hpp"
#include "simulate.hpp"
-#include "world_state.hpp"
#include "simulation_state.hpp"
-#include "node_frontend.hpp"
+#include "world_state.hpp"
-#include "BLI_timeit.h"
-#include "BLI_string.h"
-#include "BLI_parallel.h"
#include "BLI_color.h"
+#include "BLI_parallel.h"
+#include "BLI_string.h"
+#include "BLI_timeit.h"
-#include "BKE_mesh.h"
#include "BKE_customdata.h"
+#include "BKE_mesh.h"
#include "FN_node_tree.h"
#include "DEG_depsgraph_query.h"
diff --git a/source/blender/simulations/bparticles/emitters.cpp b/source/blender/simulations/bparticles/emitters.cpp
index 28e0667bdaf..09409d80e38 100644
--- a/source/blender/simulations/bparticles/emitters.cpp
+++ b/source/blender/simulations/bparticles/emitters.cpp
@@ -1,11 +1,11 @@
+#include "DNA_curve_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_curve_types.h"
#include "DNA_object_types.h"
#include "BKE_curve.h"
-#include "BKE_mesh_runtime.h"
#include "BKE_deform.h"
+#include "BKE_mesh_runtime.h"
#include "BKE_surface_hook.h"
#include "BLI_math_geom.h"
diff --git a/source/blender/simulations/bparticles/emitters.hpp b/source/blender/simulations/bparticles/emitters.hpp
index be184adf726..9ba4ba43a1a 100644
--- a/source/blender/simulations/bparticles/emitters.hpp
+++ b/source/blender/simulations/bparticles/emitters.hpp
@@ -1,8 +1,8 @@
#pragma once
-#include "world_state.hpp"
-#include "particle_action.hpp"
#include "emitter_interface.hpp"
+#include "particle_action.hpp"
+#include "world_state.hpp"
#include "FN_multi_function.h"
diff --git a/source/blender/simulations/bparticles/events.cpp b/source/blender/simulations/bparticles/events.cpp
index bb938952389..c66179cc6f1 100644
--- a/source/blender/simulations/bparticles/events.cpp
+++ b/source/blender/simulations/bparticles/events.cpp
@@ -1,5 +1,5 @@
-#include "BLI_utildefines.h"
#include "BLI_hash.h"
+#include "BLI_utildefines.h"
#include "events.hpp"
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index f3dc4b7cd9b..da336d654fd 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -1,26 +1,26 @@
-#include "BKE_surface_hook.h"
-#include "BKE_id_data_cache.h"
+#include "BLI_color.h"
+#include "BLI_multi_map.h"
+#include "BLI_set.h"
+#include "BLI_timeit.h"
+
#include "BKE_deform.h"
+#include "BKE_id_data_cache.h"
+#include "BKE_surface_hook.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "BLI_timeit.h"
-#include "BLI_multi_map.h"
-#include "BLI_set.h"
-#include "BLI_color.h"
-
-#include "FN_node_tree.h"
-#include "FN_multi_functions.h"
#include "FN_generic_tuple.h"
-#include "FN_node_tree_multi_function_network_generation.h"
#include "FN_multi_function_common_contexts.h"
#include "FN_multi_function_dependencies.h"
+#include "FN_multi_functions.h"
+#include "FN_node_tree.h"
+#include "FN_node_tree_multi_function_network_generation.h"
-#include "node_frontend.hpp"
-#include "integrator.hpp"
#include "emitters.hpp"
#include "events.hpp"
+#include "integrator.hpp"
+#include "node_frontend.hpp"
#include "offset_handlers.hpp"
#include "simulate.hpp"
diff --git a/source/blender/simulations/bparticles/node_frontend.hpp b/source/blender/simulations/bparticles/node_frontend.hpp
index d10b3b7f782..f17512984d7 100644
--- a/source/blender/simulations/bparticles/node_frontend.hpp
+++ b/source/blender/simulations/bparticles/node_frontend.hpp
@@ -2,8 +2,8 @@
#include "FN_node_tree.h"
-#include "world_state.hpp"
#include "step_simulator.hpp"
+#include "world_state.hpp"
namespace BParticles {
diff --git a/source/blender/simulations/bparticles/offset_handlers.hpp b/source/blender/simulations/bparticles/offset_handlers.hpp
index 151cc0239a2..bc64f252b6d 100644
--- a/source/blender/simulations/bparticles/offset_handlers.hpp
+++ b/source/blender/simulations/bparticles/offset_handlers.hpp
@@ -1,7 +1,7 @@
#pragma once
-#include "particle_function.hpp"
#include "offset_handler_interface.hpp"
+#include "particle_function.hpp"
namespace BParticles {
diff --git a/source/blender/simulations/bparticles/particle_action.hpp b/source/blender/simulations/bparticles/particle_action.hpp
index a50d5aefdf9..a7909f5353d 100644
--- a/source/blender/simulations/bparticles/particle_action.hpp
+++ b/source/blender/simulations/bparticles/particle_action.hpp
@@ -1,12 +1,12 @@
#pragma once
-#include "BLI_static_class_ids.h"
#include "BLI_index_mask.h"
+#include "BLI_static_class_ids.h"
-#include "particle_allocator.hpp"
#include "emitter_interface.hpp"
#include "event_interface.hpp"
#include "offset_handler_interface.hpp"
+#include "particle_allocator.hpp"
namespace BParticles {
diff --git a/source/blender/simulations/bparticles/particle_function.hpp b/source/blender/simulations/bparticles/particle_function.hpp
index 0db087320cf..ef36b119cfe 100644
--- a/source/blender/simulations/bparticles/particle_function.hpp
+++ b/source/blender/simulations/bparticles/particle_function.hpp
@@ -2,8 +2,8 @@
#include "BLI_array_cxx.h"
-#include "particle_action.hpp"
#include "force_interface.hpp"
+#include "particle_action.hpp"
#include "FN_multi_function.h"
#include "FN_multi_function_common_contexts.h"
diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index 22d3752343f..bf96c971c2e 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -1,8 +1,8 @@
-#include "BLI_timeit.h"
#include "BLI_array_cxx.h"
-#include "BLI_vector_adaptor.h"
#include "BLI_parallel.h"
+#include "BLI_timeit.h"
+#include "BLI_vector_adaptor.h"
#include "FN_cpp_type.h"
diff --git a/source/blender/simulations/bparticles/simulate.hpp b/source/blender/simulations/bparticles/simulate.hpp
index a3c7f120925..e48b231c27c 100644
--- a/source/blender/simulations/bparticles/simulate.hpp
+++ b/source/blender/simulations/bparticles/simulate.hpp
@@ -1,10 +1,10 @@
#pragma once
-#include "simulation_state.hpp"
-#include "integrator_interface.hpp"
+#include "emitter_interface.hpp"
#include "event_interface.hpp"
+#include "integrator_interface.hpp"
#include "offset_handler_interface.hpp"
-#include "emitter_interface.hpp"
+#include "simulation_state.hpp"
namespace BParticles {
diff --git a/source/blender/simulations/bparticles/world_state.hpp b/source/blender/simulations/bparticles/world_state.hpp
index 062eaf8402e..dfba91d3a3d 100644
--- a/source/blender/simulations/bparticles/world_state.hpp
+++ b/source/blender/simulations/bparticles/world_state.hpp
@@ -1,10 +1,10 @@
#pragma once
-#include "BLI_map.h"
-#include "BLI_string_ref.h"
-#include "BLI_string_map.h"
#include "BLI_float3.h"
#include "BLI_float4x4.h"
+#include "BLI_map.h"
+#include "BLI_string_map.h"
+#include "BLI_string_ref.h"
namespace BParticles {