diff options
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/WM_types.h | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 7 |
4 files changed, 21 insertions, 0 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 65a8945f82b..8ec61a62d49 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -87,6 +87,13 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +if(WITH_FREESTYLE) + list(APPEND INC + ../freestyle + ) + add_definitions(-DWITH_FREESTYLE) +endif() + if(WITH_OPENCOLLADA) add_definitions(-DWITH_COLLADA) endif() diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 6db0e142ac4..5904a417190 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -69,6 +69,10 @@ if env['BF_BUILDINFO']: if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') +if env['WITH_BF_FREESTYLE']: + incs += ' ../freestyle' + defs.append('WITH_FREESTYLE') + if env['WITH_BF_COMPOSITOR']: defs.append("WITH_COMPOSITOR") diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 86fd4856f7e..942cce1b6dd 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -239,6 +239,9 @@ typedef struct wmNotifier { #define NC_MOVIECLIP (20<<24) #define NC_MASK (21<<24) #define NC_GPENCIL (22<<24) +#ifdef WITH_FREESTYLE +# define NC_LINESTYLE (23<<24) +#endif /* 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 2196ce7ba65..2d4e4a5334a 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -115,6 +115,10 @@ #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); |