Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-05 18:52:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-05 18:52:04 +0400
commit34b18fcbc18c6d89a1a1516d19c489994e4964dc (patch)
tree2b53d4290e09ecb04762a1efc07d8553449faf11 /source/blender/windowmanager
parent299ff91ea1fe5623bea1c6775cb8250d5e4ec3a0 (diff)
code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_files.c2
-rw-r--r--source/blender/windowmanager/intern/wm_init_exit.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index a366810e647..56052b895ab 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -484,7 +484,7 @@ int WM_read_homefile(bContext *C, ReportList *UNUSED(reports), short from_memory
char tstr[FILE_MAX];
int success = 0;
- free_ttfont(); /* still weird... what does it here? */
+ BKE_vfont_free_global_ttf(); /* still weird... what does it here? */
G.relbase_valid = 0;
if (!from_memory) {
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 58c2c649163..1a1cb9d6507 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -360,7 +360,7 @@ void WM_exit_ext(bContext *C, const short do_python)
// BIF_freeRetarget();
BIF_freeTemplates(C);
- free_ttfont(); /* bke_font.h */
+ BKE_vfont_free_global_ttf(); /* bke_font.h */
free_openrecent();