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:
authorDalai Felinto <dalai@blender.org>2020-03-19 11:33:03 +0300
committerDalai Felinto <dalai@blender.org>2020-03-19 11:33:58 +0300
commit2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch)
treeec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/editors/physics
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/dynamicpaint_ops.c6
-rw-r--r--source/blender/editors/physics/particle_boids.c2
-rw-r--r--source/blender/editors/physics/particle_edit.c20
-rw-r--r--source/blender/editors/physics/particle_edit_undo.c6
-rw-r--r--source/blender/editors/physics/particle_object.c6
-rw-r--r--source/blender/editors/physics/physics_fluid.c12
-rw-r--r--source/blender/editors/physics/physics_ops.c4
7 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c
index b0dbe5d9a3e..37845e8d74e 100644
--- a/source/blender/editors/physics/dynamicpaint_ops.c
+++ b/source/blender/editors/physics/dynamicpaint_ops.c
@@ -37,11 +37,11 @@
#include "BKE_context.h"
#include "BKE_deform.h"
-#include "BKE_object_deform.h"
#include "BKE_dynamicpaint.h"
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_modifier.h"
+#include "BKE_object_deform.h"
#include "BKE_report.h"
#include "BKE_screen.h"
@@ -50,8 +50,8 @@
#include "DEG_depsgraph_query.h"
#include "ED_mesh.h"
-#include "ED_screen.h"
#include "ED_object.h"
+#include "ED_screen.h"
#include "RNA_access.h"
#include "RNA_define.h"
@@ -59,8 +59,8 @@
#include "PIL_time.h"
-#include "WM_types.h"
#include "WM_api.h"
+#include "WM_types.h"
#include "physics_intern.h" /* own include */
diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c
index 55fc49165c9..22cfa50aee9 100644
--- a/source/blender/editors/physics/particle_boids.c
+++ b/source/blender/editors/physics/particle_boids.c
@@ -39,8 +39,8 @@
#include "DEG_depsgraph_build.h"
#include "RNA_access.h"
-#include "RNA_enum_types.h"
#include "RNA_define.h"
+#include "RNA_enum_types.h"
#include "WM_api.h"
#include "WM_types.h"
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 17875688c61..8a40f65fc8a 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -21,26 +21,26 @@
* \ingroup edphys
*/
-#include <stdlib.h>
+#include <assert.h>
#include <math.h>
+#include <stdlib.h>
#include <string.h>
-#include <assert.h>
#include "MEM_guardedalloc.h"
-#include "DNA_scene_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_view3d_types.h"
+#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
+#include "DNA_view3d_types.h"
-#include "BLI_math.h"
+#include "BLI_kdtree.h"
#include "BLI_lasso_2d.h"
#include "BLI_listbase.h"
-#include "BLI_rect.h"
-#include "BLI_kdtree.h"
+#include "BLI_math.h"
#include "BLI_rand.h"
+#include "BLI_rect.h"
#include "BLI_task.h"
#include "BLI_utildefines.h"
@@ -59,10 +59,10 @@
#include "DEG_depsgraph.h"
-#include "ED_object.h"
-#include "ED_physics.h"
#include "ED_mesh.h"
+#include "ED_object.h"
#include "ED_particle.h"
+#include "ED_physics.h"
#include "ED_screen.h"
#include "ED_select_utils.h"
#include "ED_view3d.h"
@@ -74,9 +74,9 @@
#include "UI_resources.h"
#include "WM_api.h"
-#include "WM_types.h"
#include "WM_message.h"
#include "WM_toolsystem.h"
+#include "WM_types.h"
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/editors/physics/particle_edit_undo.c b/source/blender/editors/physics/particle_edit_undo.c
index e85b025e28e..5b363bdca78 100644
--- a/source/blender/editors/physics/particle_edit_undo.c
+++ b/source/blender/editors/physics/particle_edit_undo.c
@@ -21,15 +21,15 @@
* \ingroup edphys
*/
-#include <stdlib.h>
+#include <assert.h>
#include <math.h>
+#include <stdlib.h>
#include <string.h>
-#include <assert.h>
#include "MEM_guardedalloc.h"
-#include "DNA_scene_types.h"
#include "DNA_meshdata_types.h"
+#include "DNA_scene_types.h"
#include "DNA_windowmanager_types.h"
#include "BLI_listbase.h"
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index 4bd58d1bebc..f37a20bf43e 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -31,10 +31,10 @@
#include "DNA_modifier_types.h"
#include "DNA_scene_types.h"
-#include "BLI_math.h"
#include "BLI_listbase.h"
-#include "BLI_utildefines.h"
+#include "BLI_math.h"
#include "BLI_string.h"
+#include "BLI_utildefines.h"
#include "BKE_bvhutils.h"
#include "BKE_context.h"
@@ -59,9 +59,9 @@
#include "WM_api.h"
#include "WM_types.h"
+#include "ED_object.h"
#include "ED_particle.h"
#include "ED_screen.h"
-#include "ED_object.h"
#include "UI_resources.h"
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 0b754780cde..bfbe1d22334 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -33,37 +33,37 @@
#include "DNA_object_types.h"
#include "BLI_blenlib.h"
-#include "BLI_path_util.h"
#include "BLI_math.h"
+#include "BLI_path_util.h"
#include "BLI_utildefines.h"
#include "BLT_translation.h"
#include "BKE_context.h"
#include "BKE_customdata.h"
+#include "BKE_fluid.h"
+#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_report.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
-#include "BKE_fluid.h"
-#include "BKE_global.h"
#include "DEG_depsgraph.h"
#include "ED_screen.h"
#include "PIL_time.h"
-#include "WM_types.h"
#include "WM_api.h"
+#include "WM_types.h"
-#include "physics_intern.h" // own include
#include "manta_fluid_API.h"
+#include "physics_intern.h" // own include
-#include "DNA_scene_types.h"
#include "DNA_fluid_types.h"
#include "DNA_mesh_types.h"
+#include "DNA_scene_types.h"
#define FLUID_JOB_BAKE_ALL "FLUID_OT_bake_all"
#define FLUID_JOB_BAKE_DATA "FLUID_OT_bake_data"
diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c
index ea638a2fe44..f6943c25063 100644
--- a/source/blender/editors/physics/physics_ops.c
+++ b/source/blender/editors/physics/physics_ops.c
@@ -28,9 +28,9 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_select_utils.h"
-#include "ED_physics.h"
#include "ED_object.h"
+#include "ED_physics.h"
+#include "ED_select_utils.h"
#include "physics_intern.h" // own include