From a462d69bbf771e49d2fa49589608c375376b42ed Mon Sep 17 00:00:00 2001
From: Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Date: Thu, 20 Dec 2012 07:57:26 +0000
Subject: 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.
---
 source/blender/SConscript | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source/blender/SConscript')

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'])
-- 
cgit v1.2.3