archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T59900: duplicate font loading error and memory leak.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-12-27 15:22:20 +01:00
parent 7bed048243
commit de14ddf3a1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/font.c
View File

@@ -244,7 +244,6 @@ VFont *BKE_vfont_load(Main *bmain, const char *filepath)
char filename[FILE_MAXFILE];
VFont *vfont = NULL;
PackedFile *pf;
PackedFile *temp_pf = NULL;
bool is_builtin;
if (STREQ(filepath, FO_BUILTIN_NAME)) {
@@ -256,7 +255,6 @@ VFont *BKE_vfont_load(Main *bmain, const char *filepath)
else {
BLI_split_file_part(filepath, filename, sizeof(filename));
pf = newPackedFile(NULL, filepath, BKE_main_blendfile_path(bmain));
temp_pf = newPackedFile(NULL, filepath, BKE_main_blendfile_path(bmain));
is_builtin = false;
}
@@ -282,7 +280,7 @@ VFont *BKE_vfont_load(Main *bmain, const char *filepath)
/* Do not add FO_BUILTIN_NAME to temporary listbase */
if (!STREQ(filename, FO_BUILTIN_NAME)) {
vfont->temp_pf = temp_pf;
vfont->temp_pf = newPackedFile(NULL, filepath, BKE_main_blendfile_path(bmain));
}
}