[Bf-blender-cvs] [54a5059fe93] master: Cleanup: finish modifiers' hearder re-order from rBe31f0fad9744c813.
Bastien Montagne
noreply at git.blender.org
Mon Feb 25 11:59:49 CET 2019
Commit: 54a5059fe93d7e43177ac2f903a6c28e5db8d978
Author: Bastien Montagne
Date: Mon Feb 25 11:56:24 2019 +0100
Branches: master
https://developer.blender.org/rB54a5059fe93d7e43177ac2f903a6c28e5db8d978
Cleanup: finish modifiers' hearder re-order from rBe31f0fad9744c813.
For some reason forgot to handle half of modifier files...
===================================================================
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluidsim.c
M source/blender/modifiers/intern/MOD_fluidsim_util.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.c
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_meshcache_mdd.c
M source/blender/modifiers/intern/MOD_meshcache_pc2.c
M source/blender/modifiers/intern/MOD_meshcache_util.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_multires.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index cd54b06435c..e58beaaa42d 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -24,12 +24,12 @@
#include <string.h>
+#include "BLI_utildefines.h"
+
#include "DNA_armature_types.h"
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
-#include "BLI_utildefines.h"
-
#include "BKE_editmesh.h"
#include "BKE_lattice.h"
#include "BKE_library.h"
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 87492f8a605..56567c79c6a 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -25,9 +25,10 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_utildefines.h"
+#include "BLI_math.h"
+
#include "DNA_curve_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 60a4b862407..7bd877f6dee 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -23,14 +23,15 @@
#include "MEM_guardedalloc.h"
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "BLI_utildefines.h"
-#include "BLI_math.h"
-
#include "BKE_deform.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 10fab203fbd..b81536ff947 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -25,26 +25,25 @@
#include <stdio.h>
-#include "DNA_object_types.h"
-
#include "BLI_utildefines.h"
-#include "BLI_math_matrix.h"
-
-#include "BKE_library_query.h"
-#include "BKE_modifier.h"
-
-#include "MOD_util.h"
#include "BLI_alloca.h"
#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
#include "BKE_global.h" /* only to check G.debug */
#include "BKE_library.h"
+#include "BKE_library_query.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
+#include "BKE_modifier.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
+
+#include "MOD_util.h"
#include "DEG_depsgraph_query.h"
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index ea2750b87c7..e46c9aca5ce 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -24,9 +24,10 @@
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
-#include "BLI_rand.h"
-#include "BLI_math_vector.h"
+
#include "BLI_ghash.h"
+#include "BLI_math_vector.h"
+#include "BLI_rand.h"
#include "DNA_meshdata_types.h"
#include "DNA_mesh_types.h"
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index d28610a4a7b..4aac71dd58d 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -22,13 +22,13 @@
*/
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
+#include "BLI_utildefines.h"
#include "BLI_math.h"
-#include "BLI_utildefines.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
#include "BKE_deform.h"
#include "BKE_editmesh.h"
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index 3844fce24c3..54dcf796036 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -23,6 +23,10 @@
#include <string.h>
+#include "BLI_utildefines.h"
+
+#include "BLI_listbase.h"
+
#include "DNA_cloth_types.h"
#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
@@ -31,9 +35,6 @@
#include "MEM_guardedalloc.h"
-#include "BLI_listbase.h"
-#include "BLI_utildefines.h"
-
#include "BKE_cloth.h"
#include "BKE_effect.h"
#include "BKE_global.h"
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index b525f152d6e..3e1fa4954fa 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -21,15 +21,16 @@
* \ingroup modifiers
*/
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
#include "BKE_collision.h"
#include "BKE_global.h"
#include "BKE_library.h"
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index e9079421f4f..fa5e68fa630 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -23,14 +23,15 @@
* Method of smoothing deformation, also known as 'delta-mush'.
*/
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
#include "DNA_scene_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
#include "MEM_guardedalloc.h"
#include "BKE_deform.h"
diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c
index 86eb49ea8f4..4a8b6de9981 100644
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@ -23,12 +23,12 @@
#include <string.h>
+#include "BLI_utildefines.h"
+
#include "DNA_mesh_types.h"
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
-#include "BLI_utildefines.h"
-
#include "BKE_editmesh.h"
#include "BKE_lattice.h"
#include "BKE_library.h"
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 9d613107905..d7b18074b09 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -22,6 +22,7 @@
*/
#include "BLI_utildefines.h"
+
#include "BLI_math.h"
#include "DNA_mesh_types.h"
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 95b71d36926..fbc3529c221 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -21,13 +21,14 @@
* \ingroup modifiers
*/
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
#include "MEM_guardedalloc.h"
#include "BKE_deform.h"
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index d1c1f74b68f..fc619837cb7 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -22,14 +22,15 @@
*/
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
-
#include "BLI_utildefines.h"
+
#include "BLI_math.h"
#include "BLI_task.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
+
#include "BKE_customdata.h"
#include "BKE_editmesh.h"
#include "BKE_library.h"
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index 1970774195e..3fea556c3e4 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -20,14 +20,14 @@
#include <stddef.h>
+#include "BLI_utildefines.h"
+
#include "DNA_dynamicpaint_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force_types.h"
#include "DNA_scene_types.h"
#include "DNA_mesh_types.h"
-#include "BLI_utildefines.h"
-
#include "BKE_dynamicpaint.h"
#include "BKE_layer.h"
#include "BKE_library_query.h"
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index 601133a9ec6..548790ef78f 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -27,17 +27,18 @@
*/
#include "BLI_utildefines.h"
+
#include "BLI_math.h"
+#include "DNA_mesh_types.h"
+#include "DNA_object_types.h"
+
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "bmesh.h"
#include "bmesh_tools.h"
-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
-
#include "MOD_modifiertypes.h"
static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd)
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 54874f6ee92..5c5612f29a4 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -22,17 +22,18 @@
*/
+#include "BLI_utildefines.h"
+
+#include "BLI_edgehash.h"
+#include "BLI_kdtree.h"
+#include "BLI_math.h"
+#include "BLI_rand.h"
+
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
-#include "BLI_utildefines.h"
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_math.h"
-#include "BLI_edgehash.h"
-
#include "BKE_deform.h"
#include "BKE_lattice.h"
#include "BKE_library.h"
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c
index 774217c8831..d4bac71f677 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim.c
@@ -22,13 +22,13 @@
*/
+#include "BLI_utildefines.h"
+
#include "DNA_mesh_types.h"
#include "DNA_scene_types.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h"
-#include "BLI_utildefines.h"
-
#include "
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list