From 93ac968db3bc47e3520c662671cf68e86c0f2204 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 5 Apr 2013 17:56:54 +0000 Subject: code cleanup: include order --- source/blender/editors/armature/reeb.c | 4 ++-- source/blender/editors/gpencil/gpencil_undo.c | 4 ++-- source/blender/editors/include/UI_resources.h | 2 +- source/blender/editors/render/render_preview.c | 4 ++-- source/blender/editors/space_clip/clip_dopesheet_draw.c | 8 ++++---- source/blender/editors/space_clip/clip_draw.c | 10 +++++----- source/blender/editors/space_clip/clip_graph_draw.c | 8 ++++---- source/blender/editors/space_file/file_panels.c | 5 ++--- source/blender/editors/space_file/space_file.c | 4 ++-- source/blender/editors/space_node/node_ops.c | 4 ++-- source/blender/editors/transform/transform_constraints.c | 4 ++-- 11 files changed, 28 insertions(+), 29 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 649ef90f7ba..665c5f628d9 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -26,13 +26,13 @@ #include "MEM_guardedalloc.h" -#include "BKE_context.h" - #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_edgehash.h" #include "BLI_ghash.h" +#include "BKE_context.h" + #include "reeb.h" #if 0 /* UNUSED 2.5 */ diff --git a/source/blender/editors/gpencil/gpencil_undo.c b/source/blender/editors/gpencil/gpencil_undo.c index 3d2cd260fb9..7edf723022f 100644 --- a/source/blender/editors/gpencil/gpencil_undo.c +++ b/source/blender/editors/gpencil/gpencil_undo.c @@ -38,12 +38,12 @@ #include "DNA_listBase.h" #include "DNA_windowmanager_types.h" +#include "BLI_listbase.h" + #include "BKE_blender.h" #include "BKE_context.h" #include "BKE_gpencil.h" -#include "BLI_listbase.h" - #include "ED_gpencil.h" #include "WM_api.h" diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 51d16094609..b37b4f40c08 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -308,4 +308,4 @@ const unsigned char *UI_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, i void UI_make_axis_color(const unsigned char *src_col, unsigned char *dst_col, const char axis); -#endif /* UI_RESOURCES_H */ +#endif /* __UI_RESOURCES_H__ */ diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index b851dc3be94..08349e2e0bb 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -43,13 +43,13 @@ #endif #include "MEM_guardedalloc.h" -#include "BLO_readfile.h" - #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_threads.h" #include "BLI_utildefines.h" +#include "BLO_readfile.h" + #include "DNA_world_types.h" #include "DNA_camera_types.h" #include "DNA_material_types.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index b1be9217819..382b0b75c5e 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -35,10 +35,6 @@ #include "MEM_guardedalloc.h" -#include "BKE_context.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" - #include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_string.h" @@ -46,6 +42,10 @@ #include "BLI_math.h" #include "BLI_rect.h" +#include "BKE_context.h" +#include "BKE_movieclip.h" +#include "BKE_tracking.h" + #include "ED_screen.h" #include "ED_clip.h" diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 1000aced3a9..1d2ea8d7305 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -37,11 +37,6 @@ #include "MEM_guardedalloc.h" -#include "BKE_context.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" -#include "BKE_mask.h" - #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" @@ -52,6 +47,11 @@ #include "BLI_rect.h" #include "BLI_math_base.h" +#include "BKE_context.h" +#include "BKE_movieclip.h" +#include "BKE_tracking.h" +#include "BKE_mask.h" + #include "ED_screen.h" #include "ED_clip.h" #include "ED_mask.h" diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c index 7b070fde6ba..973200dc340 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.c +++ b/source/blender/editors/space_clip/clip_graph_draw.c @@ -35,14 +35,14 @@ #include "MEM_guardedalloc.h" -#include "BKE_context.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" - #include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_string.h" +#include "BKE_context.h" +#include "BKE_movieclip.h" +#include "BKE_tracking.h" + #include "ED_screen.h" #include "ED_clip.h" diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index 35179511563..d6f644ab330 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -28,13 +28,12 @@ * \ingroup spfile */ +#include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_screen.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" - #include "BLF_translation.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 698c355fad3..d2624c7fa97 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -35,14 +35,14 @@ #include "BIF_gl.h" -#include "BLO_readfile.h" - #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" #include "BLI_fileops_types.h" +#include "BLO_readfile.h" + #include "BKE_context.h" #include "BKE_screen.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 513bde4375c..0155750fbf8 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -31,10 +31,10 @@ #include "DNA_node_types.h" -#include "BKE_context.h" - #include "BLI_utildefines.h" +#include "BKE_context.h" + #include "ED_node.h" /* own include */ #include "ED_screen.h" #include "ED_transform.h" diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 7678051fd38..2752d76fbf0 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -49,12 +49,12 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BKE_context.h" - #include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_string.h" +#include "BKE_context.h" + #include "ED_image.h" #include "ED_view3d.h" -- cgit v1.2.3