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/bmesh/intern
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r--source/blender/bmesh/intern/bmesh_core.c4
-rw-r--r--source/blender/bmesh/intern/bmesh_edgeloop.c4
-rw-r--r--source/blender/bmesh/intern/bmesh_iterators.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_log.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_marking.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_mesh_conv.c10
-rw-r--r--source/blender/bmesh/intern/bmesh_mesh_validate.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_mods.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_operators.c6
-rw-r--r--source/blender/bmesh/intern/bmesh_polygon.c6
-rw-r--r--source/blender/bmesh/intern/bmesh_polygon_edgenet.c10
-rw-r--r--source/blender/bmesh/intern/bmesh_query.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_walkers.c2
13 files changed, 27 insertions, 27 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index f795783d161..8f55c14c681 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -22,10 +22,10 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math_vector.h"
-#include "BLI_array.h"
#include "BLI_alloca.h"
+#include "BLI_array.h"
#include "BLI_linklist_stack.h"
+#include "BLI_math_vector.h"
#include "BLI_utildefines_stack.h"
#include "BLT_translation.h"
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c
index c07bae5e3f2..e4312877fc6 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.c
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.c
@@ -25,11 +25,11 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math_vector.h"
#include "BLI_listbase.h"
+#include "BLI_math_vector.h"
#include "BLI_mempool.h"
-#include "BLI_utildefines_iter.h"
#include "BLI_stack.h"
+#include "BLI_utildefines_iter.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c
index b1e20dd6058..c4dd53b0497 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.c
+++ b/source/blender/bmesh/intern/bmesh_iterators.c
@@ -24,8 +24,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
#include "BLI_bitmap.h"
+#include "BLI_utildefines.h"
#include "bmesh.h"
#include "intern/bmesh_private.h"
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index b4e78453226..6c0585a7759 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -31,11 +31,11 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_mempool.h"
+#include "BLI_utildefines.h"
#include "BKE_customdata.h"
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 58a7d423d67..d33f4e0a1d6 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -31,8 +31,8 @@
#include "DNA_scene_types.h"
-#include "BLI_math.h"
#include "BLI_listbase.h"
+#include "BLI_math.h"
#include "bmesh.h"
#include "bmesh_structure.h"
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 1ecbfccab74..de32d7881b0 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -70,25 +70,25 @@
* and only editing the active shape key-block.
*/
+#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
#include "DNA_modifier_types.h"
-#include "DNA_key_types.h"
+#include "DNA_object_types.h"
#include "MEM_guardedalloc.h"
-#include "BLI_listbase.h"
#include "BLI_alloca.h"
+#include "BLI_listbase.h"
#include "BLI_math_vector.h"
+#include "BKE_customdata.h"
#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
-#include "BKE_customdata.h"
#include "BKE_multires.h"
-#include "BKE_main.h"
#include "BKE_key.h"
+#include "BKE_main.h"
#include "bmesh.h"
#include "intern/bmesh_private.h" /* For element checking. */
diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.c b/source/blender/bmesh/intern/bmesh_mesh_validate.c
index 83ab29940f3..f8830e1557b 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_validate.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_validate.c
@@ -26,8 +26,8 @@
/* debug builds only */
#ifdef DEBUG
-# include "BLI_utildefines.h"
# include "BLI_edgehash.h"
+# include "BLI_utildefines.h"
# include "bmesh.h"
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 53f68804bd3..7b5df536192 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -23,8 +23,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_array.h"
+#include "BLI_math.h"
#include "BKE_customdata.h"
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index 2ec7e06a264..d3c8499477b 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -22,12 +22,12 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
-#include "BLI_string.h"
+#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_memarena.h"
#include "BLI_mempool.h"
-#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
#include "BLT_translation.h"
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index 915ad6bf5c4..9ab5106cec2 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -23,18 +23,18 @@
*/
#include "DNA_listBase.h"
-#include "DNA_modifier_types.h"
#include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
#include "MEM_guardedalloc.h"
#include "BLI_alloca.h"
+#include "BLI_heap.h"
+#include "BLI_linklist.h"
#include "BLI_math.h"
#include "BLI_memarena.h"
#include "BLI_polyfill_2d.h"
#include "BLI_polyfill_2d_beautify.h"
-#include "BLI_linklist.h"
-#include "BLI_heap.h"
#include "bmesh.h"
#include "bmesh_tools.h"
diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
index f6ed95d322d..284f5265b90 100644
--- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
+++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
@@ -24,14 +24,14 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
-#include "BLI_memarena.h"
-#include "BLI_array.h"
#include "BLI_alloca.h"
-#include "BLI_utildefines_stack.h"
+#include "BLI_array.h"
+#include "BLI_kdopbvh.h"
#include "BLI_linklist_stack.h"
+#include "BLI_math.h"
+#include "BLI_memarena.h"
#include "BLI_sort_utils.h"
-#include "BLI_kdopbvh.h"
+#include "BLI_utildefines_stack.h"
#include "BKE_customdata.h"
diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c
index a9b0d4d3918..e3b6e243906 100644
--- a/source/blender/bmesh/intern/bmesh_query.c
+++ b/source/blender/bmesh/intern/bmesh_query.c
@@ -27,9 +27,9 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_alloca.h"
#include "BLI_linklist.h"
+#include "BLI_math.h"
#include "BLI_utildefines_stack.h"
#include "BKE_customdata.h"
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c
index 05ae8c940af..860c83ec1e5 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <string.h> /* for memcpy */
-#include "BLI_utildefines.h"
#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
#include "bmesh.h"