option to build without the legacy compositor
authorCampbell Barton <ideasman42@gmail.com>
Sun, 19 Aug 2012 22:19:19 +0000 (22:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 19 Aug 2012 22:19:19 +0000 (22:19 +0000)
64 files changed:
CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript
source/blender/nodes/composite/node_composite_tree.c
source/blender/nodes/composite/nodes/node_composite_alphaOver.c
source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
source/blender/nodes/composite/nodes/node_composite_blur.c
source/blender/nodes/composite/nodes/node_composite_brightness.c
source/blender/nodes/composite/nodes/node_composite_channelMatte.c
source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
source/blender/nodes/composite/nodes/node_composite_colorMatte.c
source/blender/nodes/composite/nodes/node_composite_colorSpill.c
source/blender/nodes/composite/nodes/node_composite_colorbalance.c
source/blender/nodes/composite/nodes/node_composite_composite.c
source/blender/nodes/composite/nodes/node_composite_crop.c
source/blender/nodes/composite/nodes/node_composite_curves.c
source/blender/nodes/composite/nodes/node_composite_defocus.c
source/blender/nodes/composite/nodes/node_composite_diffMatte.c
source/blender/nodes/composite/nodes/node_composite_dilate.c
source/blender/nodes/composite/nodes/node_composite_directionalblur.c
source/blender/nodes/composite/nodes/node_composite_displace.c
source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
source/blender/nodes/composite/nodes/node_composite_filter.c
source/blender/nodes/composite/nodes/node_composite_flip.c
source/blender/nodes/composite/nodes/node_composite_gamma.c
source/blender/nodes/composite/nodes/node_composite_glare.c
source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
source/blender/nodes/composite/nodes/node_composite_huecorrect.c
source/blender/nodes/composite/nodes/node_composite_idMask.c
source/blender/nodes/composite/nodes/node_composite_image.c
source/blender/nodes/composite/nodes/node_composite_inpaint.c
source/blender/nodes/composite/nodes/node_composite_invert.c
source/blender/nodes/composite/nodes/node_composite_lensdist.c
source/blender/nodes/composite/nodes/node_composite_levels.c
source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
source/blender/nodes/composite/nodes/node_composite_mapUV.c
source/blender/nodes/composite/nodes/node_composite_mapValue.c
source/blender/nodes/composite/nodes/node_composite_math.c
source/blender/nodes/composite/nodes/node_composite_mixrgb.c
source/blender/nodes/composite/nodes/node_composite_movieclip.c
source/blender/nodes/composite/nodes/node_composite_normal.c
source/blender/nodes/composite/nodes/node_composite_normalize.c
source/blender/nodes/composite/nodes/node_composite_premulkey.c
source/blender/nodes/composite/nodes/node_composite_rgb.c
source/blender/nodes/composite/nodes/node_composite_rotate.c
source/blender/nodes/composite/nodes/node_composite_scale.c
source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
source/blender/nodes/composite/nodes/node_composite_setalpha.c
source/blender/nodes/composite/nodes/node_composite_splitViewer.c
source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
source/blender/nodes/composite/nodes/node_composite_texture.c
source/blender/nodes/composite/nodes/node_composite_tonemap.c
source/blender/nodes/composite/nodes/node_composite_trackpos.c
source/blender/nodes/composite/nodes/node_composite_transform.c
source/blender/nodes/composite/nodes/node_composite_translate.c
source/blender/nodes/composite/nodes/node_composite_valToRgb.c
source/blender/nodes/composite/nodes/node_composite_value.c
source/blender/nodes/composite/nodes/node_composite_vecBlur.c
source/blender/nodes/composite/nodes/node_composite_viewer.c
source/blender/nodes/composite/nodes/node_composite_zcombine.c

index fd473889909e319a97d6e246addd2b2306b2c2f2..338135f498758cc4ebeb491aaab0ca8297c42d31 100644 (file)
@@ -132,6 +132,7 @@ option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 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 @@ if(FIRST_RUN)
        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)
index d95751af82f6ee493809f549c9071ecd2190b6a1..64987a52a213ca83054e6be5ec2eda01b6243b1c 100644 (file)
@@ -251,4 +251,8 @@ if(WITH_COMPOSITOR)
        add_definitions(-DWITH_COMPOSITOR)
 endif()
 
+if(WITH_COMPOSITOR_LEGACY)
+       add_definitions(-DWITH_COMPOSITOR_LEGACY)
+endif()
+
 blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}")
index bf70b5a6ed58a3fac98c59e22663923530a851f9..f42dfdd2e1e1138283c77f550b16d6c27bfd40dd 100644 (file)
@@ -40,6 +40,9 @@ if env['WITH_BF_COMPOSITOR']:
     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] )
index c6ad97c31da2b66dc463114850896f125cc46ea4..17808179836afd78238646cda38b0f5801db475b 100644 (file)
@@ -359,6 +359,7 @@ void ntreeCompositEndExecTree(bNodeTreeExec *exec, int use_tree_data)
 }
 
 #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 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr
        /* 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;
 }
 
 /* *********************************************** */
index 588574e324c3facc901ee82a82479813c8e9e9a3..7e6def1714a42a11b4c2da7cfa83de3904c7f40d 100644 (file)
@@ -29,7 +29,6 @@
  *  \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** ALPHAOVER ******************** */
@@ -109,8 +108,6 @@ static void do_alphaover_mixed(bNode *node, float *out, float *src, float *over,
 }
 
 
-
-
 static void node_composit_exec_alphaover(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
 {
        /* stack order in: col col */
@@ -153,7 +150,8 @@ void register_node_type_cmp_alphaover(bNodeTreeType *ttype)
        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);
 }
index 0137093658c4bb4c5621e82e1be7aa978fcf4f93..cfaf40e2ab0279ef9105542faa0d46cc5c5c5f39 100644 (file)
@@ -271,7 +271,8 @@ void register_node_type_cmp_bilateralblur(bNodeTreeType *ttype)
        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);
 }
index fb163222781100965a3087b5f81116fa5194f162..c95b2d23bdad0d0d3b159d6916c953be8b5479bd 100644 (file)
@@ -734,7 +734,8 @@ void register_node_type_cmp_blur(bNodeTreeType *ttype)
        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);
 }
index 8761d35f18f54dcfd80bd40cf3e8e35d083b7f13..d30a2ba5e03de12b0c873c6a2d07ebc01d3c3570 100644 (file)
@@ -99,7 +99,9 @@ void register_node_type_cmp_brightcontrast(bNodeTreeType *ttype)
        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);
 }
index 6163d8f01b1a050055b277f21325379035d1d81c..12af1a7aa20ad321e49eb4d98fad623007cdb2b5 100644 (file)
@@ -209,7 +209,9 @@ void register_node_type_cmp_channel_matte(bNodeTreeType *ttype)
        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);
 }
index 0c6ce79c51faf4efb494999d464c4594fc847cf4..1204b05e4153d7dcbe7d4155a372b1ec52f9786e 100644 (file)
@@ -192,7 +192,9 @@ void register_node_type_cmp_chroma_matte(bNodeTreeType *ttype)
        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);
 }
index 8aad5bdf179c07ad1db9148f20858e313149cf78..d921c1efa5115e4c262fa5e36a703853d53523fa 100644 (file)
@@ -132,7 +132,9 @@ void register_node_type_cmp_color_matte(bNodeTreeType *ttype)
        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);
 }
index 678091790eade7d5f9adb04d7de2cee1a9d6ff83..bfa8aac0183c6fec7ed63047ee32358555f1af2e 100644 (file)
@@ -335,7 +335,9 @@ void register_node_type_cmp_color_spill(bNodeTreeType *ttype)
        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);
 }
index fa32db9b31d42f3acd9cd026c7e7bba738a819a9..ae5d8a24847ab291422c0dd8457330e0d29c4845 100644 (file)
@@ -192,7 +192,9 @@ void register_node_type_cmp_colorbalance(bNodeTreeType *ttype)
        node_type_size(&ntype, 400, 200, 400);
        node_type_init(&ntype, node_composit_init_colorbalance);
        node_type_storage(&ntype, "NodeColorBalance", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_colorbalance);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 7b189ef40e51271b775276d0a56168b2d75eb4e5..71b392f14dbf2e890f8a6d2bf837eafc411d8020 100644 (file)
@@ -104,7 +104,9 @@ void register_node_type_cmp_composite(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_COMPOSITE, "Composite", NODE_CLASS_OUTPUT, NODE_PREVIEW);
        node_type_socket_templates(&ntype, cmp_node_composite_in, NULL);
        node_type_size(&ntype, 80, 60, 200);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_composite);
+#endif
        /* Do not allow muting for this node. */
        node_type_internal_connect(&ntype, NULL);
 
index 8d676fd6d9ffa3d279ad088c09a13a54f7682e13..f439b7ebc0057e8d52758ab3cdcc62fc6f2b6bd2 100644 (file)
@@ -120,7 +120,9 @@ void register_node_type_cmp_crop(bNodeTreeType *ttype)
        node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_crop);
        node_type_storage(&ntype, "NodeTwoXYs", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_crop);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index b5a78015d767298608e1feda9bc9c1995271b5a9..cc9d7d1d1a44c035f3cb86daf1a7aa8691431793 100644 (file)
@@ -71,7 +71,9 @@ void register_node_type_cmp_curve_time(bNodeTreeType *ttype)
        node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_curves_time);
        node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_curves_time);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -111,7 +113,9 @@ void register_node_type_cmp_curve_vec(bNodeTreeType *ttype)
        node_type_size(&ntype, 200, 140, 320);
        node_type_init(&ntype, node_composit_init_curve_vec);
        node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_curve_vec);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -198,7 +202,9 @@ void register_node_type_cmp_curve_rgb(bNodeTreeType *ttype)
        node_type_size(&ntype, 200, 140, 320);
        node_type_init(&ntype, node_composit_init_curve_rgb);
        node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_curve_rgb);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 280ff56be12eda816dd7b0d9c7f3c1aa2d9e129b..f23702a060612c4fa5f1792beef5e85a13b1eb73 100644 (file)
@@ -891,7 +891,9 @@ void register_node_type_cmp_defocus(bNodeTreeType *ttype)
        node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_defocus);
        node_type_storage(&ntype, "NodeDefocus", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_defocus);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 53061366b8bc47e03edc13d039ae111a7df92721..b79911f27dc21fc56f6f509ac2f4eceb6330fb6b 100644 (file)
@@ -143,7 +143,9 @@ void register_node_type_cmp_diff_matte(bNodeTreeType *ttype)
        node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_diff_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_diff_matte);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 5977d291388472c97fa39391609a7692d05ee157..6425606f9c4dff041e597d8be1597becf43c87ef 100644 (file)
@@ -161,7 +161,9 @@ void register_node_type_cmp_dilateerode(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, cmp_node_dilateerode_in, cmp_node_dilateerode_out);
        node_type_size(&ntype, 130, 100, 320);
        node_type_init(&ntype, node_composit_init_dilateerode);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_dilateerode);
+#endif
        
        node_type_storage(&ntype, "NodeDilateErode", node_free_standard_storage, node_copy_standard_storage);
 
index 73e286583092c32ce07ee4b998f0eceda8acdeea..3011e5772c5e8d0aa98262a14ca4738e65488eb7 100644 (file)
@@ -139,7 +139,9 @@ void register_node_type_cmp_dblur(bNodeTreeType *ttype)
        node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_dblur);
        node_type_storage(&ntype, "NodeDBlurData", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_dblur);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 49cba801d5a04261f39cc298eb3ed7279d480f71..abf440273a1b4a616309be15d92cd52a08924e27 100644 (file)
@@ -189,7 +189,9 @@ void register_node_type_cmp_displace(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_DISPLACE, "Displace", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_displace_in, cmp_node_displace_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_displace);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 866344877765f9de9be2057ee45dbd7bced7fe9f..83b16a808a36ac9ac5864acd7798bddde2bc9759 100644 (file)
@@ -200,7 +200,9 @@ void register_node_type_cmp_distance_matte(bNodeTreeType *ttype)
        node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_distance_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_distance_matte);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index c206b9a1a5d9272550d6f06de694b65a26b8d93d..0d9f946d4f7972b229976c37956f6cc774dc9696 100644 (file)
@@ -1278,7 +1278,9 @@ void register_node_type_cmp_doubleedgemask(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_DOUBLEEDGEMASK, "Double Edge Mask", NODE_CLASS_MATTE, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_doubleedgemask_in, cmp_node_doubleedgemask_out);
        node_type_size(&ntype, 210, 210, 210);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_doubleedgemask);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index be5aab74e0217d12bcb2a2011eeea2c3b3a34f96..01fb4ee648c44802a6f97358b2df2dc917f6b8cf 100644 (file)
@@ -228,7 +228,9 @@ void register_node_type_cmp_filter(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, cmp_node_filter_in, cmp_node_filter_out);
        node_type_size(&ntype, 80, 40, 120);
        node_type_label(&ntype, node_filter_label);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_filter);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 44e93c08509bb691feb4096f8d1137a0fd02bedb..742e1f7852e367cf941c060ff25c65663e040aef 100644 (file)
@@ -95,7 +95,9 @@ void register_node_type_cmp_flip(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_FLIP, "Flip", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_flip_in, cmp_node_flip_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_flip);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index f681eb4f63052ba0ff12a84ef8daf789398eac7d..432001909f08bd4abab1f29699179ea6346c230b 100644 (file)
@@ -82,7 +82,9 @@ void register_node_type_cmp_gamma(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_gamma_in, cmp_node_gamma_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_gamma);
+#endif
        
        nodeRegisterType(ttype, &ntype);
 }
index 17a23d4295e6d6d96dc8d45964fc20824f980979..9f2666339238c7536d69bdcf9ba5da0bce4bf7b9 100644 (file)
@@ -499,7 +499,9 @@ void register_node_type_cmp_glare(bNodeTreeType *ttype)
        node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_glare);
        node_type_storage(&ntype, "NodeGlare", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_glare);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 32bfc048cc7dae0a654b7aaadadfaa4ecd3bc635..91614340c7589d127897c22645e5f06f7ba3f8a0 100644 (file)
@@ -111,7 +111,9 @@ void register_node_type_cmp_hue_sat(bNodeTreeType *ttype)
        node_type_size(&ntype, 150, 80, 250);
        node_type_init(&ntype, node_composit_init_hue_sat);
        node_type_storage(&ntype, "NodeHueSat", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_hue_sat);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index d40abbe5f4d8183e169fbbcd27c43d6e80a590f2..e4c7567d1024b1e3642cc8a0cf4d226122c78ba1 100644 (file)
@@ -160,7 +160,9 @@ void register_node_type_cmp_huecorrect(bNodeTreeType *ttype)
        node_type_size(&ntype, 320, 140, 400);
        node_type_init(&ntype, node_composit_init_huecorrect);
        node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_huecorrect);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 09be1c5450313222d3bc6c7a35f41c56ada37c25..fdf5209a8e4a4600834c31efb30846f84c986692 100644 (file)
@@ -114,7 +114,9 @@ void register_node_type_cmp_idmask(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_ID_MASK, "ID Mask", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_idmask_in, cmp_node_idmask_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_idmask);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 3060496bb9eb985e42b3611a77a58484e0232126..824fb7bd64fad388cdcf5021c3d656896d5c34a8 100644 (file)
@@ -563,7 +563,9 @@ void register_node_type_cmp_image(bNodeTreeType *ttype)
        node_type_init(&ntype, node_composit_init_image);
        node_type_storage(&ntype, "ImageUser", node_composit_free_image, node_composit_copy_image);
        node_type_update(&ntype, cmp_node_image_update, NULL);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_image);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -711,7 +713,9 @@ void register_node_type_cmp_rlayers(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_R_LAYERS, "Render Layers", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_rlayers_out);
        node_type_size(&ntype, 150, 100, 300);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_rlayers);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index dc4177bd2a4991cb98ec1156a99667dec2d48f31..e99b500c56af6edc874f27a77bbcebcdddbb9c97 100644 (file)
@@ -55,7 +55,9 @@ void register_node_type_cmp_inpaint(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_INPAINT, "Inpaint", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_inpaint_in, cmp_node_inpaint_out);
        node_type_size(&ntype, 130, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_inpaint);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 2a91647d6f53e2362d8c42e9f86ecb0a6f88d748..5bd5c73b57343b8fb5627c05526052c9868e5e2a 100644 (file)
@@ -129,7 +129,9 @@ void register_node_type_cmp_invert(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, cmp_node_invert_in, cmp_node_invert_out);
        node_type_size(&ntype, 120, 120, 140);
        node_type_init(&ntype, node_composit_init_invert);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_invert);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 7635a391441e70a46718a8f12c7cef0c2c58f253..3ca803ebbd7edb81e2f347ab4b4e15cdcd086317 100644 (file)
@@ -200,7 +200,9 @@ void register_node_type_cmp_lensdist(bNodeTreeType *ttype)
        node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_lensdist);
        node_type_storage(&ntype, "NodeLensDist", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_lensdist);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 1952756d397ab911c52c60d804cd6686cea141e7..43ad5aff4975107067530126f48856a153ea5012 100644 (file)
@@ -323,7 +323,9 @@ void register_node_type_cmp_view_levels(bNodeTreeType *ttype)
        node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_view_levels);
        node_type_storage(&ntype, "ImageUser", NULL, NULL);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_view_levels);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 955d94942a44fd9f117b095107a06c01a3005256..e6e5131c687215529ba61f1f8478e8fd689644c9 100644 (file)
@@ -113,7 +113,9 @@ void register_node_type_cmp_luma_matte(bNodeTreeType *ttype)
        node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_luma_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_luma_matte);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index a41d010ee95a65b52a27ab7a8eae232421846d27..46c8c109bb72185693d68f882550f447902028da 100644 (file)
@@ -169,7 +169,9 @@ void register_node_type_cmp_mapuv(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_MAP_UV, "Map UV", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_mapuv_in, cmp_node_mapuv_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_mapuv);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 1d296d540f9f139042fb2ec6646ef647736f6f43..da6c7f07f1a9488c0bfe683b808769c80870d8b5 100644 (file)
@@ -91,7 +91,9 @@ void register_node_type_cmp_map_value(bNodeTreeType *ttype)
        node_type_size(&ntype, 100, 60, 150);
        node_type_init(&ntype, node_composit_init_map_value);
        node_type_storage(&ntype, "TexMapping", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_map_value);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 7cf337f2f8870077d1c2e4b237693177ead2ce95..d5d7982e674115d64f2734b802b9dec451192716 100644 (file)
@@ -203,7 +203,9 @@ void register_node_type_cmp_math(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, cmp_node_math_in, cmp_node_math_out);
        node_type_size(&ntype, 120, 110, 160);
        node_type_label(&ntype, node_math_label);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_math);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 6f8891f2b819600a510f837051b5a206d34efe55..e10ea9c48b54692290dab42ad0544f7d3b6d4795 100644 (file)
@@ -90,7 +90,9 @@ void register_node_type_cmp_mix_rgb(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, cmp_node_mix_rgb_in, cmp_node_mix_rgb_out);
        node_type_size(&ntype, 110, 60, 120);
        node_type_label(&ntype, node_blend_label);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_mix_rgb);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index e8f09ae08d7c7d07385f06e9ca1bc583fe5791d0..99b5b9f1972f8a846ae8eede45184f12b6ad0591 100644 (file)
@@ -155,7 +155,9 @@ void register_node_type_cmp_movieclip(bNodeTreeType *ttype)
        node_type_size(&ntype, 120, 80, 300);
        node_type_init(&ntype, init);
        node_type_storage(&ntype, "MovieClipUser", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_movieclip);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 99a1f9ea520761c867a499a9f1af0d64be9668d2..b27f197e9e7ce12eeeace199de82dbc756ec4588 100644 (file)
@@ -99,7 +99,9 @@ void register_node_type_cmp_normal(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, cmp_node_normal_in, cmp_node_normal_out);
        node_type_init(&ntype, init);
        node_type_size(&ntype, 100, 60, 200);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_normal);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 4697ab74a9548e1a13216522f1c6f69b62ddc4e2..7a5b1b0e6558654973ea67cb540d643fbe70181d 100644 (file)
@@ -109,7 +109,9 @@ void register_node_type_cmp_normalize(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_NORMALIZE, "Normalize", NODE_CLASS_OP_VECTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_normalize_in, cmp_node_normalize_out);
        node_type_size(&ntype, 100, 60, 150);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_normalize);
+#endif
        
        nodeRegisterType(ttype, &ntype);
 }
index 63b10b804621b94073e6fc53d1b349977d617720..75626ca25af7efce06153c8048c4dd68d41a46e5 100644 (file)
@@ -68,7 +68,9 @@ void register_node_type_cmp_premulkey(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_PREMULKEY, "Alpha Convert", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_premulkey_in, cmp_node_premulkey_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_premulkey);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index beab47442d502f446bbbbaf3d772b254d0748843..5f323f4ef2cf1aa029f21c5680d26cc0d8b7c3fc 100644 (file)
@@ -66,7 +66,9 @@ void register_node_type_cmp_rgb(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, NULL, cmp_node_rgb_out);
        node_type_init(&ntype, node_composit_init_rgb);
        node_type_size(&ntype, 140, 80, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_rgb);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 773be2fb41ef9ecdd7e47394a10e5f9ae2794262..38b6e44f44eefd58a056094f836dc5c200b1c435 100644 (file)
@@ -134,7 +134,9 @@ void register_node_type_cmp_rotate(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, cmp_node_rotate_in, cmp_node_rotate_out);
        node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_rotate);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_rotate);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 1df677247620841ef9e9fd90fb6630c62184a7ce..75a4053d4ea5f48e356b8a18ab155060d6d450c1 100644 (file)
@@ -189,7 +189,9 @@ void register_node_type_cmp_scale(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_SCALE, "Scale", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_scale_in, cmp_node_scale_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_scale);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 2433cb377639c3e59cf9266cc63cbb5836bb0cec..e19984b335866dadaed692c636e6b18cc6226cd2 100644 (file)
@@ -106,7 +106,9 @@ void register_node_type_cmp_sephsva(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_SEPHSVA, "Separate HSVA", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_sephsva_in, cmp_node_sephsva_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_sephsva);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -175,7 +177,9 @@ void register_node_type_cmp_combhsva(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_COMBHSVA, "Combine HSVA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combhsva_in, cmp_node_combhsva_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_combhsva);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 988656ac454bf952d29944257308cabe64e70649..57ad91d17005af1c8d07f2ddf7a12c9fd672847c 100644 (file)
@@ -84,7 +84,9 @@ void register_node_type_cmp_seprgba(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_SEPRGBA, "Separate RGBA", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_seprgba_in, cmp_node_seprgba_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_seprgba);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -152,7 +154,9 @@ void register_node_type_cmp_combrgba(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_COMBRGBA, "Combine RGBA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combrgba_in, cmp_node_combrgba_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_combrgba);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 486c0ed61ee64ef9ac732e959bc40bde8a6ea2e6..0ba59a547b760abd8fd22703718052a01322bab4 100644 (file)
@@ -153,7 +153,9 @@ void register_node_type_cmp_sepycca(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_SEPYCCA, "Separate YCbCrA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_sepycca_in, cmp_node_sepycca_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_sepycca);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -298,7 +300,9 @@ void register_node_type_cmp_combycca(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_COMBYCCA, "Combine YCbCrA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combycca_in, cmp_node_combycca_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_combycca);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index fdaae7307f01aef6df07ab3f7d12520f064b9cb2..d6946cc9b89cbc63791f2170dedd8677dd85ac71 100644 (file)
@@ -106,7 +106,9 @@ void register_node_type_cmp_sepyuva(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_SEPYUVA, "Separate YUVA", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_sepyuva_in, cmp_node_sepyuva_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_sepyuva);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -177,7 +179,9 @@ void register_node_type_cmp_combyuva(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_COMBYUVA, "Combine YUVA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combyuva_in, cmp_node_combyuva_out);
        node_type_size(&ntype, 80, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_combyuva);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index c273807c54d1d7687629fa733481ac64543bf458..81955fbc59ee47fd9ca7e98b64984020820273cb 100644 (file)
@@ -80,7 +80,9 @@ void register_node_type_cmp_setalpha(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_SETALPHA, "Set Alpha", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_setalpha_in, cmp_node_setalpha_out);
        node_type_size(&ntype, 120, 40, 140);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_setalpha);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index abccbb83bd084c46c2b6f3370c2e0f5432a7e9f8..1b1cb420e7b7220aec7724ecd5d7332e99644dc2 100644 (file)
@@ -158,7 +158,9 @@ void register_node_type_cmp_splitviewer(bNodeTreeType *ttype)
        node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_splitviewer);
        node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_splitviewer);
+#endif
        /* Do not allow muting for this node. */
        node_type_internal_connect(&ntype, NULL);
 
index fabdf8c0536a2c843f68629bbd706043299fce92..62163b4244b6341d41af3ee84901898ccaa3c35c 100644 (file)
@@ -74,7 +74,9 @@ void register_node_type_cmp_stabilize2d(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_STABILIZE2D, "Stabilize 2D", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_stabilize2d_in, cmp_node_stabilize2d_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_stabilize2d);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 95458ad755bba27ad044b26e4e8c7bcda746f80d..7e7e32399257c6e075ad4c43f4b89314fd4e57a6 100644 (file)
@@ -149,7 +149,9 @@ void register_node_type_cmp_texture(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT, NODE_OPTIONS|NODE_PREVIEW);
        node_type_socket_templates(&ntype, cmp_node_texture_in, cmp_node_texture_out);
        node_type_size(&ntype, 120, 80, 240);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_texture);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 50006e599e50d8fefb3a71685a962598de0f7118..2beb20a9a479585ddbf49d922a26e33f233b9e51 100644 (file)
@@ -171,7 +171,9 @@ void register_node_type_cmp_tonemap(bNodeTreeType *ttype)
        node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_tonemap);
        node_type_storage(&ntype, "NodeTonemap", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_tonemap);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index a40400c85f58553a7a8d22bee04cbaa995e68520..6b32ce4b186d5c1a8d23e993a37c4aa097a96d7b 100644 (file)
@@ -59,7 +59,9 @@ void register_node_type_cmp_trackpos(bNodeTreeType *ttype)
        node_type_size(&ntype, 120, 80, 300);
        node_type_init(&ntype, init);
        node_type_storage(&ntype, "NodeTrackPosData", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_trackpos);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 8af55cde852ec18cefb854ed3c0df69572009baf..627134056102dedc1ef8ebe379e485b33593ac0f 100644 (file)
@@ -134,7 +134,9 @@ void register_node_type_cmp_transform(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_TRANSFORM, "Transform", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_transform_in, cmp_node_transform_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_transform);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index e147b100fce7c3d50ae46224aa0cac60dbafcea2..062fdb43ef913132039ac2d8bf3ebeaecf0b2a62 100644 (file)
@@ -66,7 +66,9 @@ void register_node_type_cmp_translate(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_TRANSLATE, "Translate", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_translate_in, cmp_node_translate_out);
        node_type_size(&ntype, 140, 100, 320);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_translate);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index 429ba26216484e7a72f34d5974b5b885c2f47dcc..b700325c3a129822865782fe26be118b6eee725f 100644 (file)
@@ -92,7 +92,9 @@ void register_node_type_cmp_valtorgb(bNodeTreeType *ttype)
        node_type_size(&ntype, 240, 200, 300);
        node_type_init(&ntype, node_composit_init_valtorgb);
        node_type_storage(&ntype, "ColorBand", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_valtorgb);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -144,7 +146,9 @@ void register_node_type_cmp_rgbtobw(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_RGBTOBW, "RGB to BW", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_rgbtobw_in, cmp_node_rgbtobw_out);
        node_type_size(&ntype, 80, 40, 120);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_rgbtobw);
+#endif
        
        nodeRegisterType(ttype, &ntype);
 }
index 8d39b38c2fe1df55d7f3edc8e5b0df38cf1b0f9e..9558a0c55f2031f0de6541d9ce3229f5edf651a4 100644 (file)
@@ -65,7 +65,9 @@ void register_node_type_cmp_value(bNodeTreeType *ttype)
        node_type_socket_templates(&ntype, NULL, cmp_node_value_out);
        node_type_init(&ntype, node_composit_init_value);
        node_type_size(&ntype, 80, 40, 120);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_value);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index e1a20a652270d1a408b11aa24287ee8461a31023..0ab88d1e464eccbd5edf0e871353f4a2867ea0a4 100644 (file)
@@ -103,7 +103,9 @@ void register_node_type_cmp_vecblur(bNodeTreeType *ttype)
        node_type_size(&ntype, 120, 80, 200);
        node_type_init(&ntype, node_composit_init_vecblur);
        node_type_storage(&ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_vecblur);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }
index e97863a94636b27e6ee740562a38d19b12165fde..cae8f24824333a1498985be5536737af3be9f165 100644 (file)
@@ -142,7 +142,9 @@ void register_node_type_cmp_viewer(bNodeTreeType *ttype)
        node_type_size(&ntype, 80, 60, 200);
        node_type_init(&ntype, node_composit_init_viewer);
        node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_viewer);
+#endif
        node_type_internal_connect(&ntype, NULL);
 
        nodeRegisterType(ttype, &ntype);
index e431ff17be5c5e1af1edb57afa1a003118acb033..951a95e6de8f62950598e3a208f4f5ce5f93dbf8 100644 (file)
@@ -229,7 +229,9 @@ void register_node_type_cmp_zcombine(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_ZCOMBINE, "Z Combine", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_zcombine_in, cmp_node_zcombine_out);
        node_type_size(&ntype, 80, 40, 120);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_zcombine);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }