From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 19 Mar 2020 09:33:03 +0100 Subject: Cleanup: `make format` after SortedIncludes change --- source/blender/editors/uvedit/uvedit_buttons.c | 2 +- source/blender/editors/uvedit/uvedit_draw.c | 4 ++-- source/blender/editors/uvedit/uvedit_ops.c | 23 +++++++++++----------- .../blender/editors/uvedit/uvedit_parametrizer.c | 12 +++++------ .../blender/editors/uvedit/uvedit_smart_stitch.c | 12 +++++------ source/blender/editors/uvedit/uvedit_unwrap_ops.c | 20 +++++++++---------- 6 files changed, 36 insertions(+), 37 deletions(-) (limited to 'source/blender/editors/uvedit') diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 44bffc76859..887ce274680 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -21,8 +21,8 @@ * \ingroup eduv */ -#include #include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index d9345808d28..e3504e20464 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -43,8 +43,8 @@ #include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_material.h" #include "BKE_layer.h" +#include "BKE_material.h" #include "BKE_scene.h" @@ -61,8 +61,8 @@ #include "ED_mesh.h" #include "ED_uvedit.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 4623cc61d29..b805681cfd3 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -21,32 +21,31 @@ * \ingroup eduv */ -#include -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" -#include "DNA_image_types.h" -#include "DNA_space_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_math.h" -#include "BLI_lasso_2d.h" -#include "BLI_blenlib.h" #include "BLI_array.h" +#include "BLI_blenlib.h" #include "BLI_hash.h" -#include "BLI_kdtree.h" #include "BLI_kdopbvh.h" +#include "BLI_kdtree.h" +#include "BLI_lasso_2d.h" +#include "BLI_math.h" #include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -69,19 +68,19 @@ #include "ED_image.h" #include "ED_mesh.h" #include "ED_node.h" -#include "ED_uvedit.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_transform.h" +#include "ED_uvedit.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_types.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 91e8c36ea35..5a36c83b62e 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -20,21 +20,21 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_memarena.h" -#include "BLI_math.h" -#include "BLI_rand.h" -#include "BLI_heap.h" #include "BLI_boxpack_2d.h" #include "BLI_convexhull_2d.h" +#include "BLI_heap.h" +#include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" #include "uvedit_parametrizer.h" #include -#include #include +#include #include #include "BLI_sys_types.h" /* for intptr_t support */ diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index d6652aca216..cf23cac38a7 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -21,38 +21,38 @@ * \ingroup eduv */ +#include #include #include -#include #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_math_vector.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_mesh_mapping.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_mesh_mapping.h" #include "DEG_depsgraph.h" #include "UI_interface.h" #include "ED_mesh.h" -#include "ED_uvedit.h" #include "ED_screen.h" #include "ED_space_api.h" +#include "ED_uvedit.h" #include "GPU_batch.h" #include "GPU_state.h" @@ -63,8 +63,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 7f42eeb5dd7..84d38a88902 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -21,40 +21,40 @@ * \ingroup eduv */ -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_camera_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_modifier_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_math.h" -#include "BLI_uvproject.h" #include "BLI_string.h" +#include "BLI_utildefines.h" +#include "BLI_uvproject.h" #include "BLT_translation.h" #include "BKE_cdderivedmesh.h" -#include "BKE_subsurf.h" #include "BKE_context.h" #include "BKE_customdata.h" +#include "BKE_editmesh.h" #include "BKE_image.h" +#include "BKE_layer.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" +#include "BKE_mesh.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_editmesh.h" -#include "BKE_layer.h" -#include "BKE_lib_id.h" -#include "BKE_mesh.h" +#include "BKE_subsurf.h" #include "DEG_depsgraph.h" -- cgit v1.2.3