diff options
4 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 6c1f7d454ba..f23f167b3a0 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -52,6 +52,7 @@ extern "C" { // Rendering void FRS_initialize(void); void FRS_set_context(bContext* C); + void FRS_read_file(bContext* C); int FRS_is_freestyle_enabled(struct SceneRenderLayer* srl); void FRS_init_stroke_rendering(struct Render* re); struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl); diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index fe02406801a..2b054307365 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -82,6 +82,10 @@ extern "C" { controller->setContext(C); } + void FRS_read_file(bContext* C) { + lineset_copied = false; + } + void FRS_exit() { delete pathconfig; delete controller; diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 521074463e0..ee84b318e04 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -31,6 +31,7 @@ set(INC ../blenloader ../editors/include ../gpu + ../freestyle ../imbuf ../makesdna ../makesrna diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 1df7f3228a0..89a6881a684 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -111,6 +111,8 @@ #include "BPY_extern.h" #endif +#include "FRS_freestyle.h" + #include "WM_api.h" #include "WM_types.h" #include "wm.h" @@ -414,6 +416,7 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports) BPY_app_handlers_reset(FALSE); BPY_modules_load_user(C); #endif + FRS_read_file(C); /* important to do before NULL'ing the context */ BLI_exec_cb(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST); |