[Bf-blender-cvs] [de14ddf3a14] blender2.7: Fix T59900: duplicate font loading error and memory leak.

[Brecht Van Lommel]

Commit: de14ddf3a141cb0e2baff00b06dc7d86d3088916
Author: Brecht Van Lommel
Date:   Thu Dec 27 15:22:20 2018 +0100
Branches: blender2.7
https://developer.blender.org/rBde14ddf3a141cb0e2baff00b06dc7d86d3088916

Fix T59900: duplicate font loading error and memory leak.

===================================================================

M       source/blender/blenkernel/intern/font.c

===================================================================

diff --git a/source/blender/blenkernel/intern/font.c 
b/source/blender/blenkernel/intern/font.c
index e51b10a97a4..6c716e58e23 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));
                        }
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs