[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50030] trunk/blender: option to build without the legacy compositor
Campbell Barton
ideasman42 at gmail.com
Mon Aug 20 00:19:20 CEST 2012
Revision: 50030
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50030
Author: campbellbarton
Date: 2012-08-19 22:19:19 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
option to build without the legacy compositor
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_flip.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_idMask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_inpaint.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lensdist.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapValue.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_movieclip.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_premulkey.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_setalpha.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_tonemap.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_trackpos.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_translate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_value.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/CMakeLists.txt 2012-08-19 22:19:19 UTC (rev 50030)
@@ -132,6 +132,7 @@
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
+option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON)
# GHOST Windowing Library Options
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
@@ -1796,6 +1797,7 @@
info_cfg_option(WITH_GAMEENGINE)
info_cfg_option(WITH_PLAYER)
info_cfg_option(WITH_BULLET)
+ info_cfg_option(WITH_IK_SOLVER)
info_cfg_option(WITH_IK_ITASC)
info_cfg_option(WITH_OPENCOLLADA)
info_cfg_option(WITH_FFTW3)
Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/nodes/CMakeLists.txt 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt 2012-08-19 22:19:19 UTC (rev 50030)
@@ -251,4 +251,8 @@
add_definitions(-DWITH_COMPOSITOR)
endif()
+if(WITH_COMPOSITOR_LEGACY)
+ add_definitions(-DWITH_COMPOSITOR_LEGACY)
+endif()
+
blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/SConscript 2012-08-19 22:19:19 UTC (rev 50030)
@@ -40,6 +40,9 @@
incs += ' ../compositor '
defs.append("WITH_COMPOSITOR")
+# TODO, make optional
+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] )
env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
Modified: trunk/blender/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_tree.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/node_composite_tree.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -359,6 +359,7 @@
}
#ifdef WITH_COMPOSITOR
+#ifdef WITH_COMPOSITOR_LEGACY
/* ***************************** threaded version for execute composite nodes ************* */
/* these are nodes without input, only giving values */
@@ -685,20 +686,29 @@
/* XXX top-level tree uses the ntree->execdata pointer */
ntreeCompositEndExecTree(exec, 1);
}
-#endif
+#endif /* WITH_COMPOSITOR_LEGACY */
+#endif /* WITH_COMPOSITOR */
void *COM_linker_hack = NULL;
void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview)
{
#ifdef WITH_COMPOSITOR
+#ifdef WITH_COMPOSITOR_LEGACY
if (G.debug_value == 200)
+ {
ntreeCompositExecTreeOld(ntree, rd, do_preview);
+ }
else
+#endif
+ {
COM_execute(rd, ntree, rendering);
+ }
#else
(void)ntree, (void)rd, (void)rendering, (void)do_preview;
#endif
+
+ (void)do_preview;
}
/* *********************************************** */
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -29,7 +29,6 @@
* \ingroup cmpnodes
*/
-
#include "node_composite_util.h"
/* **************** ALPHAOVER ******************** */
@@ -109,8 +108,6 @@
}
-
-
static void node_composit_exec_alphaover(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
{
/* stack order in: col col */
@@ -153,7 +150,8 @@
node_type_size(&ntype, 80, 40, 120);
node_type_init(&ntype, node_alphaover_init);
node_type_storage(&ntype, "NodeTwoFloats", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_alphaover);
-
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -271,7 +271,8 @@
node_type_size(&ntype, 150, 120, 200);
node_type_init(&ntype, node_composit_init_bilateralblur);
node_type_storage(&ntype, "NodeBilateralBlurData", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_bilateralblur);
-
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -734,7 +734,8 @@
node_type_size(&ntype, 120, 80, 200);
node_type_init(&ntype, node_composit_init_blur);
node_type_storage(&ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_blur);
-
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -99,7 +99,9 @@
node_type_base(ttype, &ntype, CMP_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, cmp_node_brightcontrast_in, cmp_node_brightcontrast_out);
node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_brightcontrast);
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -209,7 +209,9 @@
node_type_size(&ntype, 200, 80, 250);
node_type_init(&ntype, node_composit_init_channel_matte);
node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_channel_matte);
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -192,7 +192,9 @@
node_type_size(&ntype, 200, 80, 300);
node_type_init(&ntype, node_composit_init_chroma_matte);
node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_chroma_matte);
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -132,7 +132,9 @@
node_type_size(&ntype, 200, 80, 300);
node_type_init(&ntype, node_composit_init_color_matte);
node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_color_matte);
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -335,7 +335,9 @@
node_type_size(&ntype, 140, 80, 200);
node_type_init(&ntype, node_composit_init_color_spill);
node_type_storage(&ntype, "NodeColorspill", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
node_type_exec(&ntype, node_composit_exec_color_spill);
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c 2012-08-19 21:32:18 UTC (rev 50029)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c 2012-08-19 22:19:19 UTC (rev 50030)
@@ -192,7 +192,9 @@
node_type_size(&ntype, 400, 200, 400);
node_type_init(&ntype, node_composit_init_colorbalance);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list