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>2010-11-26 19:33:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-11-26 19:33:42 +0300
commitcf0820d6285c3a9379dd529ee50dcf39e2efa21c (patch)
tree08fb7672ce9f8e355ca2e99f6a52a14e3584f986 /source/blender/editors/space_text/text_draw.c
parent782d7b312ff6799258fb318e2aa5bbd64dbd2a9d (diff)
change monospace font to be an extern, not good final design but better then loading the same font 3 times.
need to load twice still because render may use the font in a thread.
Diffstat (limited to 'source/blender/editors/space_text/text_draw.c')
-rw-r--r--source/blender/editors/space_text/text_draw.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 2b27186041f..3b0d8bb7a29 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -56,13 +56,11 @@
#include "text_intern.h"
/******************** text font drawing ******************/
-static int mono= -1; // XXX needs proper storage and change all the BLF_* here
+// XXX, fixme
+#define mono blf_mono_font
static void text_font_begin(SpaceText *st)
{
- if(mono == -1)
- mono= BLF_load_mem("monospace", (unsigned char*)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size);
-
BLF_aspect(mono, 1.0);
BLF_size(mono, st->lheight, 72);
}