diff options
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/WM_types.h | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 3 |
4 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 65a8945f82b..ffeb7aff6fa 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -33,6 +33,7 @@ set(INC ../editors/include ../editors/io ../gpu + ../freestyle ../imbuf ../makesdna ../makesrna diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 68fdbec2cfa..de340ec4c9a 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -11,6 +11,7 @@ incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel' incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' incs += ' ../radiosity/extern/include' incs += ' ../makesrna ../gpu ../blenfont ../bmesh ../compositor' +incs += ' ../freestyle' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 347f46c8166..c88011aab13 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -239,6 +239,7 @@ typedef struct wmNotifier { #define NC_MOVIECLIP (20<<24) #define NC_MASK (21<<24) #define NC_GPENCIL (22<<24) +#define NC_LINESTYLE (23<<24) /* data type, 256 entries is enough, it can overlap */ #define NOTE_DATA 0x00FF0000 diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 0e4af46d0fc..1c168bc5ac5 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -115,6 +115,8 @@ #include "BPY_extern.h" #endif +#include "FRS_freestyle.h" + #include "WM_api.h" #include "WM_types.h" #include "wm.h" @@ -429,6 +431,7 @@ void WM_file_read(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_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST); |