Merged changes in the trunk up to revision 55357.
[blender.git] / source / blender / windowmanager / intern / wm_files.c
index 66f6dc7..c682165 100644 (file)
 #include "BPY_extern.h"
 #endif
 
+#ifdef WITH_FREESTYLE
+#  include "FRS_freestyle.h"
+#endif
+
 #include "WM_api.h"
 #include "WM_types.h"
 #include "wm.h"
@@ -434,6 +438,9 @@ void WM_file_read(bContext *C, const char *filepath, ReportList *reports)
                BPY_app_handlers_reset(FALSE);
                BPY_modules_load_user(C);
 #endif
+#ifdef WITH_FREESTYLE
+               FRS_read_file(C);
+#endif
 
                /* important to do before NULL'ing the context */
                BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);