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/SConscript | |
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/SConscript')
-rw-r--r-- | source/blender/SConscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index ff1d6b5de0a..5675575e245 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -35,7 +35,6 @@ SConscript(['avi/SConscript', 'blenloader/SConscript', 'gpu/SConscript', 'editors/SConscript', - 'freestyle/SConscript', 'imbuf/SConscript', 'makesdna/SConscript', 'render/SConscript', @@ -68,3 +67,6 @@ if env['WITH_BF_COLLADA']: if env['WITH_BF_COMPOSITOR']: SConscript (['compositor/SConscript', 'opencl/SConscript']) + +if env['WITH_BF_FREESTYLE']: + SConscript (['freestyle/SConscript']) |