diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 535366b78fa..ba464c76bd1 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -265,11 +265,9 @@ static void blf_glyph_cache_texture(FontBLF *font, GlyphCacheBLF *gc) gc->p2_height = font->tex_size_max; } - unsigned char *pixels = MEM_callocN((size_t)gc->p2_width * (size_t)gc->p2_height, - "BLF texture init"); GPUTexture *tex = GPU_texture_create_nD( - gc->p2_width, gc->p2_height, 0, 2, pixels, GPU_R8, GPU_DATA_UNSIGNED_BYTE, 0, false, error); - MEM_freeN(pixels); + gc->p2_width, gc->p2_height, 0, 2, NULL, GPU_R8, GPU_DATA_UNSIGNED_BYTE, 0, false, error); + gc->textures[gc->texture_current] = tex; GPU_texture_bind(tex, 0); GPU_texture_wrap_mode(tex, false); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 517d8ca51a3..3ee4d6a085e 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1123,7 +1123,8 @@ void UI_view2d_zoom_cache_reset(void) /* While scaling we can accumulate fonts at many sizes (~20 or so). * Not an issue with embedded font, but can use over 500Mb with i18n ones! See [#38244]. */ - /* note: only some views draw text, we could check for this case to avoid clearning cache */ + /* note: This can be very bad for performance. + * Only some views draw text, we could check for this case to avoid clearning cache. */ BLF_cache_clear(); } |