[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50059] trunk/blender: Legacy Compositor / Scons:

[Thomas Dinges]

Revision: 50059
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50059
Author:   dingto
Date:     2012-08-20 20:13:37 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Legacy Compositor / Scons:
* Added WITH_BF_COMPOSITOR_LEGACY, enabled per default. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/source/blender/nodes/SConscript

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2012-08-20 19:40:49 UTC (rev 50058)
+++ trunk/blender/build_files/scons/tools/btools.py	2012-08-20 20:13:37 UTC (rev 50059)
@@ -108,7 +108,7 @@
             'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
             'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
             'WITH_BF_FRAMESERVER',
-            'WITH_BF_COMPOSITOR',
+            'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY',
             'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
             'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
             'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@@ -583,7 +583,8 @@
         ('BF_BOOST_LIBPATH', 'Boost library path', ''),
         ('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
 
-        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True))
+        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)),
+        (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', True))
     ) # end of opts.AddOptions()
 
     return localopts

Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript	2012-08-20 19:40:49 UTC (rev 50058)
+++ trunk/blender/source/blender/nodes/SConscript	2012-08-20 20:13:37 UTC (rev 50059)
@@ -40,8 +40,8 @@
     incs += ' ../compositor '
     defs.append("WITH_COMPOSITOR")
 
-# TODO, make optional
-defs.append("WITH_COMPOSITOR_LEGACY")
+if env['WITH_BF_COMPOSITOR_LEGACY']:
+    defs.append("WITH_COMPOSITOR_LEGACY")
 
 env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
 env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )