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_font.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_font.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index b4ee0173010..07e568dd279 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -924,7 +924,7 @@ static void blf_font_wrap_apply( wrap.start = wrap.last[0]; i = wrap.last[1]; pen_x = 0; - pen_y -= font->glyph_cache->max_glyph_height; + pen_y -= font->glyph_cache->glyph_height_max; g_prev = NULL; lines += 1; continue; @@ -1138,7 +1138,7 @@ static void blf_font_fill(FontBLF *font) #if BLF_BLUR_ENABLE font->blur = 0; #endif - font->max_tex_size = -1; + font->tex_size_max = -1; font->buf_info.fbuf = NULL; font->buf_info.cbuf = NULL; |