diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-02-06 15:33:15 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-02-06 15:33:15 +0300 |
| commit | 9d5958f061b662039d1ab19aab19e44098769e63 (patch) | |
| tree | 46c2310774f562aaf1877fb8fa05d05fcdc556d7 /source/blender/windowmanager | |
| parent | 586d660b215083e504e2c5734197aeee639dfac8 (diff) | |
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.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index bd550fc6d44..2eb1604895b 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -572,12 +572,6 @@ int WM_read_homefile(bContext *C, int from_memory) 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 @@ int WM_read_homefile(bContext *C, int from_memory) 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... */ |