[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55856] trunk/blender/build_files/scons/ tools/Blender.py: Freestyle / Scons:

[Thomas Dinges]

Revision: 55856
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55856
Author:   dingto
Date:     2013-04-06 22:21:42 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Freestyle / Scons:
* Changes in tools\Blender.py were not merged, causing compile failure. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2013-04-06 21:48:39 UTC (rev 55855)
+++ trunk/blender/build_files/scons/tools/Blender.py	2013-04-06 22:21:42 UTC (rev 55856)
@@ -388,6 +388,10 @@
         defs.append('WITH_PYTHON')
         if env['BF_DEBUG']:
             defs.append('_DEBUG')
+            
+    if env['WITH_BF_FREESTYLE']:
+        incs.append('#/source/blender/freestyle')
+        defs.append('WITH_FREESTYLE')
 
     if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
         incs.append(env['BF_PTHREADS_INC'])