svn merge ^/trunk/blender -r42839:42871

6 files changed, 12 insertions, 13 deletions

diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index f533e205fe6..dca6d6a8a31 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -38,13 +38,13 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
+#include "MEM_guardedalloc.h"
 
-#include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
+#include "BKE_cdderivedmesh.h"
 
-#include "MEM_guardedalloc.h"
 
 #ifdef WITH_MOD_DECIMATE
 #include "LOD_decimation.h"
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index 6c2e233712e..e9d99d377ba 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -39,6 +39,8 @@
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
 #include "BKE_tessmesh.h"
@@ -46,8 +48,6 @@
 
 #include "DNA_object_types.h"
 
-#include "MEM_guardedalloc.h"
-
 /* EdgeSplit */
 /* EdgeSplit modifier: Splits edges in the mesh according to sharpness flag
  * or edge angle (can be used to achieve autosmoothing)
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c
index 51c4a1eae01..de3989dfe38 100644
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -35,14 +35,14 @@
 
 #include <stddef.h>
 
+#include "DNA_mesh_types.h"
+
 #include "BKE_cdderivedmesh.h"
 #include "BKE_multires.h"
 #include "BKE_modifier.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 
-#include "DNA_mesh_types.h"
-
 #include "MOD_util.h"
 
 static void initData(ModifierData *md)
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index 66213f38d8d..1d68e201dc0 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -35,6 +35,8 @@
 
 #include <string.h>
 
+#include "DNA_object_types.h"
+
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
@@ -42,8 +44,6 @@
 #include "BKE_modifier.h"
 #include "BKE_shrinkwrap.h"
 
-#include "DNA_object_types.h"
-
 #include "depsgraph_private.h"
 
 #include "MOD_util.h"
diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c
index a70ce3689a2..1eaef86cea2 100644
--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -39,13 +39,12 @@
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_cdderivedmesh.h"
 #include "BKE_particle.h"
 #include "BKE_deform.h"
 
-
-#include "MEM_guardedalloc.h"
-
 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"
 
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 0da5135ac26..4ae1867b243 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -42,16 +42,16 @@
 #include "BLI_smallhash.h"
 #include "BLI_string.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_particle.h"
 #include "BKE_deform.h"
 
-
 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"
 
-#include "MEM_guardedalloc.h"
 
 typedef struct EdgeFaceRef {
 	int f1; /* init as -1 */