From 5781859753b5ebdfb2e553a10c27f97b502b72ff Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 14 Jan 2013 15:53:17 +0000 Subject: Dosvidanya, old compositor! You served well and now desired retirement, but you'll always live in our hearts. And for sure -- monument! +-------------------------------------------+ / ++==+ . .. . ... . .. . / / // ++==++ ++ ++ ++==++ ++==++ / / // // // //\\//\\ // // // // / / ++==+ ++==++ // \\ //==++ ++==++ / / . ... .. . // .. ... / +-------------------------------------------+ Some notes: - Removed all code which was from inside ifdef WITH_COMPOSITOR_LEGACY - Removed some functions which were used by old compositor only but weren't ported to new color management - Removed WITH_COMPOSITOR_LEGACY from build systems - node_composite_util.h was in fatc used by compo nodes specification files, so added it back to cmake. Could be cleaned up by moving header files to files where they're actually needed but would consider this is a separate task. - Should be no functional changes! --- build_files/scons/tools/btools.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'build_files/scons/tools') diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 22360447343..ee6dd20ecc0 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -108,7 +108,7 @@ def validate_arguments(args, bc): 'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC', 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', 'WITH_BF_FRAMESERVER', - 'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY', + 'WITH_BF_COMPOSITOR', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_STATICJPEG', 'BF_JPEG_LIB_STATIC', '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', @@ -599,7 +599,6 @@ def read_opts(env, cfg, args): ('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_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', False)), (BoolVariable('WITH_BF_CYCLES_OSL', 'Build with OSL sypport in Cycles', False)), (BoolVariable('WITH_BF_STATICOSL', 'Staticly link to OSL', False)), -- cgit v1.2.3