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/space_clip/clip_buttons.c | 8 ++++---- source/blender/editors/space_clip/clip_dopesheet_draw.c | 4 ++-- source/blender/editors/space_clip/clip_dopesheet_ops.c | 4 ++-- source/blender/editors/space_clip/clip_draw.c | 10 +++++----- source/blender/editors/space_clip/clip_editor.c | 10 +++++----- source/blender/editors/space_clip/clip_graph_draw.c | 4 ++-- source/blender/editors/space_clip/clip_graph_ops.c | 4 ++-- source/blender/editors/space_clip/clip_ops.c | 14 +++++++------- source/blender/editors/space_clip/clip_toolbar.c | 2 +- source/blender/editors/space_clip/clip_utils.c | 4 ++-- source/blender/editors/space_clip/space_clip.c | 16 ++++++++-------- source/blender/editors/space_clip/tracking_ops.c | 8 ++++---- source/blender/editors/space_clip/tracking_ops_detect.c | 4 ++-- source/blender/editors/space_clip/tracking_ops_orient.c | 6 +++--- source/blender/editors/space_clip/tracking_ops_plane.c | 4 ++-- source/blender/editors/space_clip/tracking_ops_solve.c | 2 +- source/blender/editors/space_clip/tracking_ops_track.c | 10 +++++----- source/blender/editors/space_clip/tracking_select.c | 6 +++--- 18 files changed, 60 insertions(+), 60 deletions(-) (limited to 'source/blender/editors/space_clip') diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index 6b9d3fd054a..dc85b3959e1 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -21,8 +21,8 @@ * \ingroup spclip */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -30,17 +30,17 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_movieclip.h" +#include "BKE_screen.h" #include "BKE_tracking.h" #include "DEG_depsgraph.h" @@ -57,8 +57,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index 72c140011a9..eba0f33d6cc 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -24,15 +24,15 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "WM_types.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.c b/source/blender/editors/space_clip/clip_dopesheet_ops.c index fbe92195a65..cd95a00c62a 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_ops.c +++ b/source/blender/editors/space_clip/clip_dopesheet_ops.c @@ -23,9 +23,9 @@ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -33,8 +33,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 45502d1eb81..2a6cf4d5a55 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -28,24 +28,24 @@ #include "MEM_guardedalloc.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_math_base.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_image.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_screen.h" #include "ED_clip.h" -#include "ED_mask.h" #include "ED_gpencil.h" +#include "ED_mask.h" +#include "ED_screen.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 1ac4e4a81a7..6336f1bff3a 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -21,10 +21,10 @@ * \ingroup spclip */ -#include #include -#include #include +#include +#include #ifndef WIN32 # include @@ -36,11 +36,11 @@ #include "DNA_mask_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" @@ -51,12 +51,12 @@ #include "BKE_tracking.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "ED_screen.h" #include "ED_clip.h" #include "ED_mask.h" +#include "ED_screen.h" #include "ED_select_utils.h" #include "WM_api.h" diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c index 10bf8d93983..7f3d3f3d651 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.c +++ b/source/blender/editors/space_clip/clip_graph_draw.c @@ -24,15 +24,15 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 9547c65ffab..e974480a233 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -23,9 +23,9 @@ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -35,9 +35,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_clip.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_clip.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 0f978b38e60..efc8c3bb7dd 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include #ifndef WIN32 # include @@ -33,16 +33,16 @@ #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" /* min/max frames */ +#include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" -#include "BLI_path_util.h" #include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_rect.h" -#include "BLI_task.h" #include "BLI_string.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -57,11 +57,11 @@ #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c index 4c4110759cd..1e3911863fc 100644 --- a/source/blender/editors/space_clip/clip_toolbar.c +++ b/source/blender/editors/space_clip/clip_toolbar.c @@ -38,8 +38,8 @@ #include "RNA_access.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_screen.h" #include "ED_undo.h" diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c index 902229c0bba..4a0df454a78 100644 --- a/source/blender/editors/space_clip/clip_utils.c +++ b/source/blender/editors/space_clip/clip_utils.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -43,8 +43,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 3256ee3eb73..a273487eee9 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -21,43 +21,43 @@ * \ingroup spclip */ -#include #include +#include -#include "DNA_scene_types.h" #include "DNA_mask_types.h" #include "DNA_movieclip_types.h" +#include "DNA_scene_types.h" #include "DNA_view3d_types.h" /* for pivot point */ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_screen.h" +#include "BKE_tracking.h" #include "IMB_imbuf_types.h" #include "ED_anim_api.h" /* for timeline cursor drawing */ +#include "ED_clip.h" #include "ED_mask.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_time_scrub_ui.h" #include "ED_select_utils.h" -#include "ED_clip.h" +#include "ED_space_api.h" +#include "ED_time_scrub_ui.h" #include "ED_transform.h" #include "ED_uvedit.h" /* just for ED_image_draw_cursor */ #include "IMB_imbuf.h" +#include "GPU_framebuffer.h" #include "GPU_glew.h" #include "GPU_matrix.h" -#include "GPU_framebuffer.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 3c25be9fe1e..f88f6113b54 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -26,23 +26,23 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" +#include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_math.h" -#include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_ops_detect.c b/source/blender/editors/space_clip/tracking_ops_detect.c index a9c97258def..dd620e85324 100644 --- a/source/blender/editors/space_clip/tracking_ops_detect.c +++ b/source/blender/editors/space_clip/tracking_ops_detect.c @@ -31,16 +31,16 @@ #include "BKE_context.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "WM_api.h" #include "WM_types.h" #include "ED_clip.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index 8bc77cf82cb..25e30c116c5 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -28,15 +28,15 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_context.h" #include "BKE_constraint.h" -#include "BKE_tracking.h" +#include "BKE_context.h" #include "BKE_layer.h" #include "BKE_object.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c index 329dc8be894..0cf0e85929c 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.c +++ b/source/blender/editors/space_clip/tracking_ops_plane.c @@ -26,12 +26,12 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_clip/tracking_ops_solve.c b/source/blender/editors/space_clip/tracking_ops_solve.c index b6c5c087025..c18207d7045 100644 --- a/source/blender/editors/space_clip/tracking_ops_solve.c +++ b/source/blender/editors/space_clip/tracking_ops_solve.c @@ -28,8 +28,8 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c index f579b2a08e2..c14895f8483 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.c +++ b/source/blender/editors/space_clip/tracking_ops_track.c @@ -23,21 +23,21 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_context.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_global.h" +#include "BKE_main.h" +#include "BKE_movieclip.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 36e529e47d0..2166cff4883 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -26,10 +26,10 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BLI_rect.h" -#include "BLI_lasso_2d.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -49,8 +49,8 @@ #include "DEG_depsgraph.h" -#include "tracking_ops_intern.h" /* own include */ #include "clip_intern.h" /* own include */ +#include "tracking_ops_intern.h" /* own include */ static float dist_to_crns(float co[2], float pos[2], float crns[4][2]); -- cgit v1.2.3