[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24473] trunk/blender/source/blender: Fixes for martin's background mode commit - now works fine here on OS X

[Matt Ebb]

Revision: 24473
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24473
Author:   broken
Date:     2009-11-11 05:38:37 +0100 (Wed, 11 Nov 2009)

Log Message:
-----------
Fixes for martin's background mode commit - now works fine here on OS X

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_glyph.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c	2009-11-11 04:08:09 UTC (rev 24472)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c	2009-11-11 04:38:37 UTC (rev 24473)
@@ -131,7 +131,8 @@
 		}
 	}
 
-	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);
 }

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2009-11-11 04:08:09 UTC (rev 24472)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2009-11-11 04:38:37 UTC (rev 24473)
@@ -329,7 +329,7 @@
 	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