diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
| commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
| tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/freestyle | |
| parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) | |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/SConscript | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 27fd9f5d98e..71bdb6aaf9e 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -36,6 +36,8 @@ set(INC_SYS ${PNG_INC} ) +add_definitions(-DWITH_FREESTYLE) + if(WIN32) set(INC_SYS ${INC_SYS} ${PTHREADS_INC}) endif(WIN32) diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index 11b45acafaf..d5ccf12d2db 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -3,7 +3,7 @@ import sys Import ('env') sources = [] -defs = [] +defs = ['WITH_FREESTYLE'] incs = '' incs += '../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna' |