blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Cleanup: centralize BLF default functions in the header

This commit is contained in:
Campbell Barton 2020-10-22 17:30:52 +11:00
parent cf5ae6718c
commit 36653a92fa
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenfont/BLF_api.h
View File

@ -40,9 +40,6 @@ struct rcti;
int BLF_init(void);
void BLF_exit(void);
void BLF_default_dpi(int dpi);
void BLF_default_set(int fontid);
int BLF_default(void); /* get default font ID so we can pass it to other functions */
void BLF_cache_clear(void);
@ -98,13 +95,6 @@ void BLF_batch_draw_begin(void);
void BLF_batch_draw_flush(void);
void BLF_batch_draw_end(void);
/* Draw the string using the default font, size and dpi. */
void BLF_draw_default(float x, float y, float z, const char *str, size_t len) ATTR_NONNULL();
void BLF_draw_default_ascii(float x, float y, float z, const char *str, size_t len) ATTR_NONNULL();
/* Set size and DPI, and return default font ID. */
int BLF_set_default(void);
/* Draw the string using the current font. */
void BLF_draw_ex(int fontid, const char *str, size_t len, struct ResultBLF *r_info)
ATTR_NONNULL(2);
@ -257,6 +247,16 @@ void BLF_thumb_preview(const char *filename,
int h,
int channels) ATTR_NONNULL();
/* blf_default.c */
void BLF_default_dpi(int dpi);
void BLF_default_set(int fontid);
int BLF_default(void); /* get default font ID so we can pass it to other functions */
/* Draw the string using the default font, size and dpi. */
void BLF_draw_default(float x, float y, float z, const char *str, size_t len) ATTR_NONNULL();
void BLF_draw_default_ascii(float x, float y, float z, const char *str, size_t len) ATTR_NONNULL();
/* Set size and DPI, and return default font ID. */
int BLF_set_default(void);
/* blf_font_default.c */
int BLF_load_default(const bool unique);
int BLF_load_mono_default(const bool unique);

5
source/blender/blenfont/intern/blf_default.c
View File

@ -23,11 +23,6 @@
* Default API, that uses Blender's user preferences for the default size.
*/
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include "DNA_userdef_types.h"
#include "BLI_assert.h"