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/physics
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/physics')
-rw-r--r--source/blender/physics/intern/BPH_mass_spring.cpp8
-rw-r--r--source/blender/physics/intern/hair_volume.cpp2
-rw-r--r--source/blender/physics/intern/implicit_blender.c6
-rw-r--r--source/blender/physics/intern/implicit_eigen.cpp8
4 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 8f079a75f14..20dc4d5c5a8 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -25,14 +25,14 @@
extern "C" {
#include "DNA_cloth_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_object_force_types.h"
-#include "DNA_object_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
+#include "DNA_object_force_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
-#include "BLI_math.h"
#include "BLI_linklist.h"
+#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BKE_cloth.h"
diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/physics/intern/hair_volume.cpp
index 88913eef7df..b8783c51fe8 100644
--- a/source/blender/physics/intern/hair_volume.cpp
+++ b/source/blender/physics/intern/hair_volume.cpp
@@ -32,8 +32,8 @@ extern "C" {
#include "BKE_effect.h"
}
-#include "implicit.h"
#include "eigen_utils.h"
+#include "implicit.h"
/* ================ Volumetric Hair Interaction ================
* adapted from
diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c
index fd9903baa41..b1afaa52ef2 100644
--- a/source/blender/physics/intern/implicit_blender.c
+++ b/source/blender/physics/intern/implicit_blender.c
@@ -27,10 +27,10 @@
# include "MEM_guardedalloc.h"
-# include "DNA_scene_types.h"
-# include "DNA_object_types.h"
-# include "DNA_object_force_types.h"
# include "DNA_meshdata_types.h"
+# include "DNA_object_force_types.h"
+# include "DNA_object_types.h"
+# include "DNA_scene_types.h"
# include "DNA_texture_types.h"
# include "BLI_math.h"
diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/physics/intern/implicit_eigen.cpp
index b801e851b90..58538c13116 100644
--- a/source/blender/physics/intern/implicit_eigen.cpp
+++ b/source/blender/physics/intern/implicit_eigen.cpp
@@ -63,14 +63,14 @@
# include "MEM_guardedalloc.h"
extern "C" {
-# include "DNA_scene_types.h"
-# include "DNA_object_types.h"
-# include "DNA_object_force_types.h"
# include "DNA_meshdata_types.h"
+# include "DNA_object_force_types.h"
+# include "DNA_object_types.h"
+# include "DNA_scene_types.h"
# include "DNA_texture_types.h"
-# include "BLI_math.h"
# include "BLI_linklist.h"
+# include "BLI_math.h"
# include "BLI_utildefines.h"
# include "BKE_cloth.h"