From 792c4d602db232f2c0027f4e7d2d15ef4370b5f7 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Wed, 11 Nov 2009 04:38:37 +0000 Subject: [PATCH] Fixes for martin's background mode commit - now works fine here on OS X --- source/blender/blenfont/intern/blf_glyph.c | 3 ++- source/blender/windowmanager/intern/wm_files.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 7d1e43a38df..1174197dce7 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -131,7 +131,8 @@ void blf_glyph_cache_free(GlyphCacheBLF *gc) } } - glDeleteTextures(gc->cur_tex+1, gc->textures); + if (gc->cur_tex+1 > 0) + glDeleteTextures(gc->cur_tex+1, gc->textures); free((void *)gc->textures); MEM_freeN(gc); } diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 79c718ea5d6..6348e1a2717 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -329,7 +329,7 @@ int WM_read_homefile(bContext *C, wmOperator *op) wm_init_userdef(); /* When loading factory settings, the reset solid OpenGL lights need to be applied. */ - GPU_default_lights(); + if (!G.background) GPU_default_lights(); /* XXX */ G.save_over = 0; // start with save preference untitled.blend