[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18829] branches/blender2.5/blender/source /blender/windowmanager/intern/wm_files.c: 2.5

[Ton Roosendaal]

Revision: 18829
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18829
Author:   ton
Date:     2009-02-06 13:33:15 +0100 (Fri, 06 Feb 2009)

Log Message:
-----------
2.5

Bugfix for Bugfix for 2.5 - Bugfix #18251!

- the call to GPU_default_lights has to be done after windows opened,
  in case you have no .b.blend saved it crashed
- further this function is only called on .B.blend reading, so it's
  correct to reset the lighting to user-def.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2009-02-06 11:11:42 UTC (rev 18828)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2009-02-06 12:33:15 UTC (rev 18829)
@@ -572,12 +572,6 @@
 		success = BKE_read_file(C, tstr, NULL, NULL);
 	} else {
 		success = BKE_read_file_from_memory(C, datatoc_B_blend, datatoc_B_blend_size, NULL, NULL);
-		
-		/* When loading factory settings, the reset solid OpenGL lights need to be applied. */
-		U.light[0].flag=0;
-		U.light[1].flag=0;
-		U.light[2].flag=0;
-		GPU_default_lights();
 	}
 	
 	/* match the read WM with current WM */
@@ -588,6 +582,12 @@
 
 	init_userdef_themes();
 	
+	/* When loading factory settings, the reset solid OpenGL lights need to be applied. */
+	U.light[0].flag=0;
+	U.light[1].flag=0;
+	U.light[2].flag=0;
+	GPU_default_lights();
+	
 	/* XXX */
 	G.save_over = 0;	// start with save preference untitled.blend
 	G.fileflags &= ~G_FILE_AUTOPLAY;	/*  disable autoplay in .B.blend... */