diff options
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/WM_types.h | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 6 |
4 files changed, 19 insertions, 4 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index ffeb7aff6fa..8ec61a62d49 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -33,7 +33,6 @@ set(INC ../editors/include ../editors/io ../gpu - ../freestyle ../imbuf ../makesdna ../makesrna @@ -88,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 3702a2d909c..5904a417190 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -37,7 +37,6 @@ 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' @@ -70,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 c88011aab13..2cb19ccdf09 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -239,7 +239,9 @@ typedef struct wmNotifier { #define NC_MOVIECLIP (20<<24) #define NC_MASK (21<<24) #define NC_GPENCIL (22<<24) -#define NC_LINESTYLE (23<<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 20b205a642a..918068cc7d1 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -115,7 +115,9 @@ #include "BPY_extern.h" #endif -#include "FRS_freestyle.h" +#ifdef WITH_FREESTYLE +# include "FRS_freestyle.h" +#endif #include "WM_api.h" #include "WM_types.h" @@ -441,7 +443,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); |