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/operators
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r--source/blender/bmesh/operators/bmo_bevel.c4
-rw-r--r--source/blender/bmesh/operators/bmo_bisect_plane.c2
-rw-r--r--source/blender/bmesh/operators/bmo_bridge.c2
-rw-r--r--source/blender/bmesh/operators/bmo_connect.c4
-rw-r--r--source/blender/bmesh/operators/bmo_connect_concave.c8
-rw-r--r--source/blender/bmesh/operators/bmo_connect_nonplanar.c4
-rw-r--r--source/blender/bmesh/operators/bmo_connect_pair.c2
-rw-r--r--source/blender/bmesh/operators/bmo_dissolve.c2
-rw-r--r--source/blender/bmesh/operators/bmo_dupe.c2
-rw-r--r--source/blender/bmesh/operators/bmo_edgenet.c2
-rw-r--r--source/blender/bmesh/operators/bmo_extrude.c2
-rw-r--r--source/blender/bmesh/operators/bmo_fill_attribute.c2
-rw-r--r--source/blender/bmesh/operators/bmo_inset.c2
-rw-r--r--source/blender/bmesh/operators/bmo_mesh_conv.c2
-rw-r--r--source/blender/bmesh/operators/bmo_normals.c2
-rw-r--r--source/blender/bmesh/operators/bmo_offset_edgeloops.c2
-rw-r--r--source/blender/bmesh/operators/bmo_planar_faces.c2
-rw-r--r--source/blender/bmesh/operators/bmo_removedoubles.c4
-rw-r--r--source/blender/bmesh/operators/bmo_rotate_edges.c2
-rw-r--r--source/blender/bmesh/operators/bmo_subdivide.c6
-rw-r--r--source/blender/bmesh/operators/bmo_subdivide_edgering.c6
-rw-r--r--source/blender/bmesh/operators/bmo_symmetrize.c2
-rw-r--r--source/blender/bmesh/operators/bmo_triangulate.c2
-rw-r--r--source/blender/bmesh/operators/bmo_utils.c2
24 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c
index 1d5bcf8b160..18193beff58 100644
--- a/source/blender/bmesh/operators/bmo_bevel.c
+++ b/source/blender/bmesh/operators/bmo_bevel.c
@@ -22,10 +22,10 @@
#include "BLI_utildefines.h"
-#include "bmesh.h"
-#include "bmesh_tools.h"
#include "BKE_curveprofile.h"
#include "DNA_curveprofile_types.h"
+#include "bmesh.h"
+#include "bmesh_tools.h"
#include "intern/bmesh_operators_private.h" /* own include */
diff --git a/source/blender/bmesh/operators/bmo_bisect_plane.c b/source/blender/bmesh/operators/bmo_bisect_plane.c
index f3062cac85c..ef59ebf1f2f 100644
--- a/source/blender/bmesh/operators/bmo_bisect_plane.c
+++ b/source/blender/bmesh/operators/bmo_bisect_plane.c
@@ -22,9 +22,9 @@
#include "MEM_guardedalloc.h"
+#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BLI_utildefines_stack.h"
-#include "BLI_math.h"
#include "bmesh.h"
#include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c
index bad5036f6cf..5713c17e146 100644
--- a/source/blender/bmesh/operators/bmo_bridge.c
+++ b/source/blender/bmesh/operators/bmo_bridge.c
@@ -20,9 +20,9 @@
* Connect verts across faces (splits faces) and bridge tool.
*/
+#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_utildefines.h"
-#include "BLI_listbase.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 2f0b21667e4..9969d31a4a5 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -20,10 +20,10 @@
* Connect verts across faces (splits faces).
*/
-#include "BLI_utildefines.h"
-#include "BLI_utildefines_stack.h"
#include "BLI_alloca.h"
#include "BLI_linklist_stack.h"
+#include "BLI_utildefines.h"
+#include "BLI_utildefines_stack.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c b/source/blender/bmesh/operators/bmo_connect_concave.c
index 0d0c21774c3..e7b86f102a2 100644
--- a/source/blender/bmesh/operators/bmo_connect_concave.c
+++ b/source/blender/bmesh/operators/bmo_connect_concave.c
@@ -30,14 +30,14 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
#include "BLI_alloca.h"
-#include "BLI_memarena.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_utildefines.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
index 5be4826c7d3..e0c5109430d 100644
--- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c
+++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
@@ -20,10 +20,10 @@
* Connect verts non-planer faces iteratively (splits faces).
*/
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
#include "BLI_alloca.h"
#include "BLI_linklist_stack.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c
index 07ead2b8a96..ba8a93ff819 100644
--- a/source/blender/bmesh/operators/bmo_connect_pair.c
+++ b/source/blender/bmesh/operators/bmo_connect_pair.c
@@ -22,9 +22,9 @@
#include "MEM_guardedalloc.h"
+#include "BLI_heap_simple.h"
#include "BLI_math.h"
#include "BLI_utildefines.h"
-#include "BLI_heap_simple.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index 6c662323ec1..8c2e820df63 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -23,8 +23,8 @@
#include "MEM_guardedalloc.h"
#include "BLI_array.h"
-#include "BLI_stack.h"
#include "BLI_math.h"
+#include "BLI_stack.h"
#include "bmesh.h"
#include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c
index 65b70f62b58..6e968d58631 100644
--- a/source/blender/bmesh/operators/bmo_dupe.c
+++ b/source/blender/bmesh/operators/bmo_dupe.c
@@ -22,8 +22,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_alloca.h"
+#include "BLI_math.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_edgenet.c b/source/blender/bmesh/operators/bmo_edgenet.c
index d38a1be7a8d..16bbbd5df88 100644
--- a/source/blender/bmesh/operators/bmo_edgenet.c
+++ b/source/blender/bmesh/operators/bmo_edgenet.c
@@ -22,8 +22,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_array.h"
+#include "BLI_math.h"
#include "bmesh.h"
#include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c
index 7d557204369..7a7f4a14db3 100644
--- a/source/blender/bmesh/operators/bmo_extrude.c
+++ b/source/blender/bmesh/operators/bmo_extrude.c
@@ -24,8 +24,8 @@
#include "DNA_meshdata_types.h"
-#include "BLI_math.h"
#include "BLI_buffer.h"
+#include "BLI_math.h"
#include "BKE_customdata.h"
diff --git a/source/blender/bmesh/operators/bmo_fill_attribute.c b/source/blender/bmesh/operators/bmo_fill_attribute.c
index 1e226beffc7..782fd98c2ea 100644
--- a/source/blender/bmesh/operators/bmo_fill_attribute.c
+++ b/source/blender/bmesh/operators/bmo_fill_attribute.c
@@ -20,8 +20,8 @@
* Fill in geometry with the attributes of their adjacent data.
*/
-#include "BLI_utildefines.h"
#include "BLI_linklist_stack.h"
+#include "BLI_utildefines.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c
index 43dacfb5100..097a7aca383 100644
--- a/source/blender/bmesh/operators/bmo_inset.c
+++ b/source/blender/bmesh/operators/bmo_inset.c
@@ -23,8 +23,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_alloca.h"
+#include "BLI_math.h"
#include "BLI_memarena.h"
#include "BLI_utildefines_stack.h"
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index 2c76074ad79..e480db64f9d 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -22,9 +22,9 @@
* into a Bmesh, and back again.
*/
+#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
-#include "DNA_key_types.h"
#include "BLI_math.h"
diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c
index b24afc0f8e6..93a377ac2ca 100644
--- a/source/blender/bmesh/operators/bmo_normals.c
+++ b/source/blender/bmesh/operators/bmo_normals.c
@@ -22,8 +22,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_linklist_stack.h"
+#include "BLI_math.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_offset_edgeloops.c b/source/blender/bmesh/operators/bmo_offset_edgeloops.c
index 37b2133e0e4..d723e128bf1 100644
--- a/source/blender/bmesh/operators/bmo_offset_edgeloops.c
+++ b/source/blender/bmesh/operators/bmo_offset_edgeloops.c
@@ -25,8 +25,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_alloca.h"
+#include "BLI_math.h"
#include "BLI_utildefines_stack.h"
#include "BKE_customdata.h"
diff --git a/source/blender/bmesh/operators/bmo_planar_faces.c b/source/blender/bmesh/operators/bmo_planar_faces.c
index 9315d002d46..c8f9d9a38dd 100644
--- a/source/blender/bmesh/operators/bmo_planar_faces.c
+++ b/source/blender/bmesh/operators/bmo_planar_faces.c
@@ -22,8 +22,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_ghash.h"
+#include "BLI_math.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 1d28d8223cd..02f17ea5d4a 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -22,12 +22,12 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_alloca.h"
#include "BLI_kdtree.h"
#include "BLI_listbase.h"
-#include "BLI_utildefines_stack.h"
+#include "BLI_math.h"
#include "BLI_stack.h"
+#include "BLI_utildefines_stack.h"
#include "BKE_customdata.h"
diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.c b/source/blender/bmesh/operators/bmo_rotate_edges.c
index 56eaac03970..0c7c13610e6 100644
--- a/source/blender/bmesh/operators/bmo_rotate_edges.c
+++ b/source/blender/bmesh/operators/bmo_rotate_edges.c
@@ -22,8 +22,8 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_heap.h"
+#include "BLI_math.h"
#include "bmesh.h"
diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c
index 41f65dd6f5a..bf63261fd4d 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.c
+++ b/source/blender/bmesh/operators/bmo_subdivide.c
@@ -22,17 +22,17 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
-#include "BLI_rand.h"
#include "BLI_array.h"
+#include "BLI_math.h"
#include "BLI_noise.h"
+#include "BLI_rand.h"
#include "BLI_stack.h"
#include "BKE_customdata.h"
#include "bmesh.h"
-#include "intern/bmesh_private.h"
#include "intern/bmesh_operators_private.h"
+#include "intern/bmesh_private.h"
typedef struct SubDParams {
int numcuts;
diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
index b9d5548f5d4..b261f018e3e 100644
--- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c
+++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
@@ -33,11 +33,11 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
-#include "BLI_utildefines_stack.h"
#include "BLI_alloca.h"
-#include "BLI_math.h"
#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+#include "BLI_utildefines_stack.h"
#include "BKE_curve.h"
diff --git a/source/blender/bmesh/operators/bmo_symmetrize.c b/source/blender/bmesh/operators/bmo_symmetrize.c
index 31c61f28ea9..e0df1c57d98 100644
--- a/source/blender/bmesh/operators/bmo_symmetrize.c
+++ b/source/blender/bmesh/operators/bmo_symmetrize.c
@@ -20,8 +20,8 @@
* Makes the mesh symmetrical by splitting along an axis and duplicating the geometry.
*/
-#include "BLI_utildefines.h"
#include "BLI_math.h"
+#include "BLI_utildefines.h"
#include "bmesh.h"
#include "intern/bmesh_operators_private.h"
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index f2a4f85acf9..b07494345ab 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -25,8 +25,8 @@
#include "DNA_listBase.h"
#include "BLI_math.h"
-#include "BLI_sort_utils.h"
#include "BLI_scanfill.h"
+#include "BLI_sort_utils.h"
#include "bmesh.h"
#include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c
index bc06d5e454b..ffb4af1fe3c 100644
--- a/source/blender/bmesh/operators/bmo_utils.c
+++ b/source/blender/bmesh/operators/bmo_utils.c
@@ -25,8 +25,8 @@
#include "DNA_meshdata_types.h"
-#include "BLI_math.h"
#include "BLI_alloca.h"
+#include "BLI_math.h"
#include "BKE_customdata.h"