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:
authorTon Roosendaal <ton@blender.org>2003-11-24 02:51:18 +0300
committerTon Roosendaal <ton@blender.org>2003-11-24 02:51:18 +0300
commit8307f2f5fe2bc110565be32d6553aa349d55268c (patch)
treeb09ad14e6504761d0e264468b10eaa72f93d0879
parenta2387c352b5126dc0e777a0a111c32bbff639520 (diff)
- bug fix: in background render, the default builtin font was not
activated for rendering when other fonts were packed too.
-rw-r--r--source/blender/blenkernel/intern/font.c2
-rw-r--r--source/blender/src/usiblender.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 878109fa255..5f6e07b368d 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -117,7 +117,7 @@ void BKE_font_register_builtin(void *mem, int size)
static PackedFile *get_builtin_packedfile(void)
{
if (!builtin_font_data) {
- printf("Internal error, builtin font not loaded");
+ printf("Internal error, builtin font not loaded\n");
return NULL;
} else {
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 60e1ae64f99..f8df5706caf 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -484,7 +484,6 @@ static void initbuttons(void)
void BIF_init(void)
{
- BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size);
initscreen(); /* for (visuele) speed, this first, then setscreen */
initbuttons();