diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
tree | ec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/editors/mesh | |
parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/editors/mesh')
27 files changed, 88 insertions, 88 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 5f948595a22..987447c3663 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_bitmap.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 7a0124e72bb..1484dcfa92d 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -33,15 +33,15 @@ #include "BKE_context.h" #include "BKE_editmesh.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_uvedit.h" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 123672a977b..10c290e2be9 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -22,24 +22,24 @@ #include "DNA_object_types.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" +#include "BKE_curveprofile.h" #include "BKE_editmesh.h" -#include "BKE_unit.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_mesh.h" -#include "BKE_curveprofile.h" +#include "BKE_unit.h" -#include "DNA_mesh_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_mesh_types.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index e0a4195a668..bc8c456889d 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -29,22 +29,22 @@ #include "BLT_translation.h" -#include "BKE_global.h" #include "BKE_context.h" #include "BKE_editmesh.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_utils.h" #include "ED_mesh.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_utils.h" #include "UI_resources.h" diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 3e79b7f1b9d..1ea1501fc66 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -24,19 +24,19 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_layer.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.c b/source/blender/editors/mesh/editmesh_extrude_screw.c index ef393acdb4e..4cffd12cb34 100644 --- a/source/blender/editors/mesh/editmesh_extrude_screw.c +++ b/source/blender/editors/mesh/editmesh_extrude_screw.c @@ -32,8 +32,8 @@ #include "BKE_layer.h" #include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c index 69274f77049..9f1d499bb6a 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin.c @@ -26,12 +26,12 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c index 979c59632e1..75a36b68f8b 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c @@ -23,14 +23,14 @@ #include "BKE_context.h" #include "BKE_scene.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_gizmo_utils.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index ea1942dee5f..f2983f06da6 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -22,19 +22,19 @@ #include "DNA_object_types.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_editmesh.h" -#include "BKE_unit.h" +#include "BKE_global.h" #include "BKE_layer.h" +#include "BKE_unit.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 847a8ecacc3..7718a07a55e 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -22,17 +22,17 @@ #include "DNA_object_types.h" +#include "BLI_buffer.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_stack.h" -#include "BLI_buffer.h" -#include "BLI_linklist_stack.h" -#include "BKE_layer.h" -#include "BKE_editmesh_bvh.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_editmesh_bvh.h" +#include "BKE_layer.h" +#include "BKE_report.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index b951c06ba8c..6230eacba94 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -29,14 +29,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_array.h" #include "BLI_alloca.h" +#include "BLI_array.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_smallhash.h" #include "BLI_memarena.h" +#include "BLI_smallhash.h" +#include "BLI_string.h" #include "BLT_translation.h" @@ -50,10 +50,10 @@ #include "GPU_matrix.h" #include "GPU_state.h" +#include "ED_mesh.h" #include "ED_screen.h" #include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_mesh.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c index ce0d5d9f7a7..10e8bfa529f 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.c +++ b/source/blender/editors/mesh/editmesh_knife_project.c @@ -24,14 +24,14 @@ #include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_mesh.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editmesh.h" +#include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_object.h" #include "BKE_report.h" @@ -39,8 +39,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 066b692e1ff..37bacb4af55 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -25,27 +25,27 @@ #include "MEM_guardedalloc.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "DNA_mesh_types.h" #include "BKE_context.h" +#include "BKE_editmesh.h" +#include "BKE_layer.h" #include "BKE_modifier.h" #include "BKE_report.h" -#include "BKE_editmesh.h" #include "BKE_unit.h" -#include "BKE_layer.h" #include "UI_interface.h" +#include "ED_mesh.h" +#include "ED_numinput.h" #include "ED_screen.h" #include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_mesh.h" -#include "ED_numinput.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c index cd91aa1e491..3a0a028468d 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -40,15 +40,15 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_sculpt.h" #include "ED_view3d.h" diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index e09bcaf4edc..7cde233c6b6 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -23,25 +23,25 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" #ifdef WITH_FREESTYLE # include "DNA_meshdata_types.h" #endif -#include "BLI_math.h" #include "BLI_linklist.h" +#include "BLI_math.h" -#include "BKE_layer.h" #include "BKE_context.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" #include "BKE_report.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_uvedit.h" #include "ED_view3d.h" diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c index fac0fc72c0b..c7bb45ccfe3 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.c +++ b/source/blender/editors/mesh/editmesh_polybuild.c @@ -28,15 +28,15 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" #include "BKE_layer.h" +#include "BKE_mesh.h" +#include "BKE_report.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_scene.h" #include "ED_screen.h" #include "ED_transform.h" diff --git a/source/blender/editors/mesh/editmesh_preselect_edgering.c b/source/blender/editors/mesh/editmesh_preselect_edgering.c index 92a8c7da71d..50af79fc5e1 100644 --- a/source/blender/editors/mesh/editmesh_preselect_edgering.c +++ b/source/blender/editors/mesh/editmesh_preselect_edgering.c @@ -20,8 +20,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_stack.h" #include "BLI_math.h" +#include "BLI_stack.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 3fa6569e3e9..a1ea6074044 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -25,16 +25,16 @@ #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_array.h" +#include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_rip_edge.c b/source/blender/editors/mesh/editmesh_rip_edge.c index e2aca1e6831..6775cb85ef9 100644 --- a/source/blender/editors/mesh/editmesh_rip_edge.c +++ b/source/blender/editors/mesh/editmesh_rip_edge.c @@ -27,9 +27,9 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 1635aa72ee0..f01511fa513 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -23,21 +23,21 @@ #include "MEM_guardedalloc.h" +#include "BLI_array.h" #include "BLI_bitmap.h" -#include "BLI_listbase.h" +#include "BLI_heap.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" #include "BLI_rand.h" -#include "BLI_array.h" -#include "BLI_heap.h" #include "BLI_utildefines_stack.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "WM_api.h" #include "WM_types.h" @@ -46,11 +46,11 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" -#include "ED_transform.h" #include "ED_select_utils.h" +#include "ED_transform.h" #include "ED_view3d.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 3a1781b941a..b52f63e0a1b 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -35,17 +35,17 @@ #include "BLI_bitmap.h" #include "BLI_heap_simple.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_sort_utils.h" #include "BLI_string.h" -#include "BKE_editmesh.h" #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.h" @@ -60,8 +60,8 @@ #include "BLT_translation.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 951efdc6127..1f857ad4710 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -22,32 +22,32 @@ #include "CLG_log.h" +#include "DNA_key_types.h" +#include "DNA_layer_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_key_types.h" -#include "DNA_layer_types.h" -#include "BLI_listbase.h" #include "BLI_array_utils.h" +#include "BLI_listbase.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_editmesh.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_mesh.h" -#include "ED_util.h" +#include "ED_object.h" #include "ED_undo.h" +#include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #define USE_ARRAY_STORE diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index d281dc46b2c..f44a94a63f8 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -23,25 +23,25 @@ #include "MEM_guardedalloc.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_key_types.h" -#include "BLI_math.h" #include "BLI_alloca.h" #include "BLI_buffer.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BKE_DerivedMesh.h" #include "BKE_context.h" +#include "BKE_editmesh.h" +#include "BKE_editmesh_bvh.h" +#include "BKE_global.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_report.h" -#include "BKE_editmesh.h" -#include "BKE_editmesh_bvh.h" -#include "BKE_global.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 7007ff29401..51b699acd63 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -29,9 +29,9 @@ #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index 628c8273bc5..9b599d8df7f 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -29,8 +29,8 @@ #include "DNA_object_types.h" #include "BKE_editmesh.h" -#include "BLI_kdtree.h" #include "BKE_mesh.h" +#include "BLI_kdtree.h" #include "ED_mesh.h" diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index d467a963799..c61fe39b5fd 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -21,16 +21,16 @@ * \ingroup edmesh */ -#include "DNA_scene_types.h" #include "DNA_modifier_types.h" +#include "DNA_scene_types.h" #include "RNA_access.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 8f31fa0a1fa..6c5106d3eec 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -37,8 +37,8 @@ #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_deform.h" |