diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-08 02:02:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-08 02:02:11 +0300 |
| commit | db28e2deb9d154ed50600542e37828867d0148e5 (patch) | |
| tree | 279612479f5a0052d4a189af6e36b3dbff1e231c /source/blender/blenfont | |
| parent | e960cecdf8d1cef32f8c42e633ad05a08a97972b (diff) | |
| parent | 7dc3ad22873e08de11172757066bb2b3a27f7203 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/BLF_api.h | 2 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index 1b967f889c0..22559edad22 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -41,7 +41,7 @@ struct rctf; struct ColorManagedDisplay; struct ResultBLF; -int BLF_init(int points, int dpi); +int BLF_init(void); void BLF_exit(void); void BLF_default_dpi(int dpi); void BLF_default_set(int fontid); diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 55c08361a47..24347d57917 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -97,15 +97,16 @@ static FontBLF *blf_get(int fontid) return NULL; } -int BLF_init(int points, int dpi) +int BLF_init(void) { int i; for (i = 0; i < BLF_MAX_FONT; i++) global_font[i] = NULL; - global_font_points = points; - global_font_dpi = dpi; + global_font_points = 11; + global_font_dpi = 72; + return blf_font_init(); } |