diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
| commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
| tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /source/blender/blenfont/intern/blf.c | |
| parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
| parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) | |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index df600feb1fe..b94c6e35823 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -810,7 +810,7 @@ int BLF_height_max(int fontid) FontBLF *font = blf_get(fontid); if (font && font->glyph_cache) { - return font->glyph_cache->max_glyph_height; + return font->glyph_cache->glyph_height_max; } return 0; @@ -821,7 +821,7 @@ float BLF_width_max(int fontid) FontBLF *font = blf_get(fontid); if (font && font->glyph_cache) { - return font->glyph_cache->max_glyph_width; + return font->glyph_cache->glyph_width_max; } return 0.0f; |