bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Harley Acheson 2024-07-03 20:38:24 -07:00
commit 444626593c
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/vfont.cc
View File

@ -39,7 +39,6 @@
#include "BKE_anim_path.h"
#include "BKE_bpath.hh"
#include "BKE_context.hh"
#include "BKE_curve.hh"
#include "BKE_global.hh"
#include "BKE_idtype.hh"
@ -47,7 +46,6 @@
#include "BKE_main.hh"
#include "BKE_object_types.hh"
#include "BKE_packedFile.h"
#include "BKE_report.hh"
#include "BKE_vfont.hh"
#include "BKE_vfontdata.hh"
@ -302,16 +300,6 @@ static VFontData *vfont_get_data(VFont *vfont)
if (!pf) {
CLOG_WARN(&LOG, "Font file doesn't exist: %s", vfont->filepath);
if (!G.background) {
bContext *C_temp = CTX_create();
wmWindowManager *wm = static_cast<wmWindowManager *>(G_MAIN->wm.first);
if (wm) {
CTX_wm_manager_set(C_temp, wm);
BKE_reportf(CTX_wm_reports(C_temp), RPT_ERROR, "Missing font: %s", vfont->filepath);
}
CTX_free(C_temp);
}
/* DON'T DO THIS
* missing file shouldn't modify path! - campbell */
#if 0

5
source/blender/blenkernel/intern/vfontdata_freetype.cc
View File

@ -93,10 +93,7 @@ VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, ulong character)
}
if (font_id == -1) {
/* This could happen for a saved file with unpacked local font, later
* removed. Load the default UI font so we can still show _something_. */
font_id = BLF_load_mem(
vfont->data->name, static_cast<const uchar *>(builtin_font_data), builtin_font_size);
return nullptr;
}
VChar *che = (VChar *)MEM_callocN(sizeof(VChar), "objfnt_char");