merged changes to revision 24077

[blender-staging.git] / source / blender / windowmanager / intern / wm_files.c

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index b2e55c8532e2291aa06969edf73f394b297bb850..640aab1c84ea2f9b792d912e39807ebb1a424331 100644 (file)
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -89,6 +89,8 @@
 
 #include "GPU_draw.h"
 
 
 #include "GPU_draw.h"
 

+#include "FRS_freestyle.h"
+

 // XXX #include "BPY_extern.h"
 
 #include "WM_api.h"
 // XXX #include "BPY_extern.h"
 
 #include "WM_api.h"


@@ -268,6 +270,8 @@ void WM_read_file(bContext *C, char *name, ReportList *reports)
                        writeBlog();
                }
 
                        writeBlog();
                }
 

+               FRS_initialize(C);
+

 // XXX         undo_editmode_clear();
                BKE_reset_undo();
                BKE_write_undo(C, "original");  /* save current state */
 // XXX         undo_editmode_clear();
                BKE_reset_undo();
                BKE_write_undo(C, "original");  /* save current state */


@@ -327,6 +331,8 @@ int WM_read_homefile(bContext *C, wmOperator *op)
        strcpy(G.sce, scestr); /* restore */
        
        wm_init_userdef();
        strcpy(G.sce, scestr); /* restore */
        
        wm_init_userdef();

+       FRS_initialize(C);
+       

        
        /* When loading factory settings, the reset solid OpenGL lights need to be applied. */
        GPU_default_lights();
        
        /* When loading factory settings, the reset solid OpenGL lights need to be applied. */
        GPU_default_lights();