[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18815] branches/blender2.5/blender/source /blender/windowmanager/intern/wm_files.c: Bugfix for 2.5 - Bugfix #18251

[Joshua Leung]

Revision: 18815
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18815
Author:   aligorith
Date:     2009-02-04 23:33:24 +0100 (Wed, 04 Feb 2009)

Log Message:
-----------
Bugfix for 2.5 - Bugfix #18251

The patch was pasted in the wrong place, thus destroying all custom OpenGL solid light setups too.

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-04 21:38:03 UTC (rev 18814)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2009-02-04 22:33:24 UTC (rev 18815)
@@ -571,14 +571,14 @@
 		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();
 	}
 	
-	/* 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 */
 	wm_window_match_do(C, &wmbase); 
 	wm_check(C); /* opens window(s), checks keymaps */