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/blenfont/intern/blf.c | 8 ++++---- source/blender/blenfont/intern/blf_dir.c | 4 ++-- source/blender/blenfont/intern/blf_font.c | 6 +++--- source/blender/blenfont/intern/blf_font_win32_compat.c | 2 +- source/blender/blenfont/intern/blf_glyph.c | 10 +++++----- source/blender/blenfont/intern/blf_internal_types.h | 2 +- source/blender/blenfont/intern/blf_thumbs.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'source/blender/blenfont/intern') diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 5664b9ae0a0..520456653d1 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -25,10 +25,10 @@ * Wraps OpenGL and FreeType. */ +#include #include #include #include -#include #include @@ -47,12 +47,12 @@ #include "IMB_colormanagement.h" -#include "GPU_shader.h" -#include "GPU_matrix.h" #include "GPU_immediate.h" +#include "GPU_matrix.h" +#include "GPU_shader.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" /* Max number of font in memory. * Take care that now every font have a glyph cache per size/dpi, diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c index 204be5a86b2..9603470615d 100644 --- a/source/blender/blenfont/intern/blf_dir.c +++ b/source/blender/blenfont/intern/blf_dir.c @@ -36,16 +36,16 @@ #include "DNA_vec_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLF_api.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" static ListBase global_font_dir = {NULL, NULL}; diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 0f75d9b5ab0..4d56f6f868f 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -25,10 +25,10 @@ * Also low level functions for managing \a FontBLF. */ +#include #include #include #include -#include #include @@ -50,11 +50,11 @@ #include "UI_interface.h" -#include "GPU_matrix.h" #include "GPU_batch.h" +#include "GPU_matrix.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenfont/intern/blf_font_win32_compat.c b/source/blender/blenfont/intern/blf_font_win32_compat.c index e73df4dbfc7..7d130204c07 100644 --- a/source/blender/blenfont/intern/blf_font_win32_compat.c +++ b/source/blender/blenfont/intern/blf_font_win32_compat.c @@ -31,8 +31,8 @@ # include "MEM_guardedalloc.h" -# include "BLI_utildefines.h" # include "BLI_fileops.h" +# include "BLI_utildefines.h" # include "blf_internal.h" diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 3270eec58f9..a38cb323777 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -23,10 +23,10 @@ * Glyph rendering, texturing and caching. Wraps Freetype and OpenGL functions. */ +#include #include #include #include -#include #include @@ -37,8 +37,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_vec_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "BLI_listbase.h" #include "BLI_rect.h" @@ -46,14 +46,14 @@ #include "BLF_api.h" -#include "GPU_immediate.h" #include "GPU_extensions.h" +#include "GPU_immediate.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" -#include "BLI_strict_flags.h" #include "BLI_math_vector.h" +#include "BLI_strict_flags.h" KerningCacheBLF *blf_kerning_cache_find(FontBLF *font) { diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index 6ea1702200f..6fae3eb4376 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -24,8 +24,8 @@ #ifndef __BLF_INTERNAL_TYPES_H__ #define __BLF_INTERNAL_TYPES_H__ -#include "GPU_vertex_buffer.h" #include "GPU_texture.h" +#include "GPU_vertex_buffer.h" #define BLF_BATCH_DRAW_LEN_MAX 2048 /* in glyph */ diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c index 4e44a85443d..b7308d47d71 100644 --- a/source/blender/blenfont/intern/blf_thumbs.c +++ b/source/blender/blenfont/intern/blf_thumbs.c @@ -30,10 +30,10 @@ #include FT_FREETYPE_H -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_rect.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "blf_internal.h" #include "blf_internal_types.h" -- cgit v1.2.3