diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-27 21:13:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-27 21:13:27 +0300 |
| commit | 3e5374bf1ecda6515808e348a768ed7afa536505 (patch) | |
| tree | 47ceb06abd968da4405e47c46b03a35a7f40087b /source/blender/blenkernel/intern/font.c | |
| parent | 5b9440278ee9001645e4475436f6899c84d4ba1c (diff) | |
| parent | 826d7adde79216d271b78059c05abd10b7559899 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/blenkernel/intern/font.c')
| -rw-r--r-- | source/blender/blenkernel/intern/font.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 1b6061d5b04..d796110f185 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -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)); } } |