[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50031] trunk/blender/source/blender/nodes /composite/nodes: disabling the compositor legacy build option now ifdef' s exec() functions.
Campbell Barton
ideasman42 at gmail.com
Mon Aug 20 01:36:30 CEST 2012
Revision: 50031
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50031
Author: campbellbarton
Date: 2012-08-19 23:36:29 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
disabling the compositor legacy build option now ifdef's exec() functions.
Modified Paths:
--------------
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/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c 2012-08-19 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -43,6 +43,8 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void do_alphaover_premul(bNode *UNUSED(node), float *out, float *src, float *over, float *fac)
{
@@ -136,6 +138,8 @@
}
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_alphaover_init(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
node->storage= MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -43,6 +43,8 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
#define INIT_C3 \
mean0 = 1; \
mean1[0] = src[0]; \
@@ -254,6 +256,8 @@
free_compbuf(new);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
{
NodeBilateralBlurData *nbbd = MEM_callocN(sizeof(NodeBilateralBlurData), "node bilateral blur data");
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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -44,6 +44,8 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static float *make_gausstab(int filtertype, int rad)
{
float *gausstab, sum, val;
@@ -720,6 +722,8 @@
generate_preview(data, node, out[0]->data);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
{
node->storage = MEM_callocN(sizeof(NodeBlurData), "node blur data");
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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -47,6 +47,8 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void do_brightnesscontrast(bNode *UNUSED(node), float *out, float *in, float *in_brightness, float *in_contrast)
{
float i;
@@ -92,6 +94,8 @@
}
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
void register_node_type_cmp_brightcontrast(bNodeTreeType *ttype)
{
static bNodeType 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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -45,6 +45,8 @@
{-1, 0, ""}
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void do_normalized_rgba_to_ycca2(bNode *UNUSED(node), float *out, float *in)
{
/*normalize to the range 0.0 to 1.0) */
@@ -179,12 +181,14 @@
out[0]->data=outbuf;
if (out[1]->hasoutput)
out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A);
-
+
if (cbuf!=in[0]->data)
free_compbuf(cbuf);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -45,6 +45,8 @@
{-1, 0, ""}
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void do_rgba_to_ycca_normalized(bNode *UNUSED(node), float *out, float *in)
{
rgb_to_ycc(in[0], in[1], in[2], &out[0], &out[1], &out[2], BLI_YCC_ITU_BT601);
@@ -171,6 +173,7 @@
free_compbuf(cbuf);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -45,6 +45,8 @@
{-1, 0, ""}
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void do_color_key(bNode *node, float *out, float *in)
{
float h_wrap;
@@ -112,6 +114,8 @@
free_compbuf(cbuf);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_color_matte(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node color");
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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -47,6 +47,8 @@
{-1, 0, ""}
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void do_simple_spillmap_red(bNode *node, float* out, float *in)
{
NodeColorspill *ncs;
@@ -315,6 +317,8 @@
free_compbuf(spillmap);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_color_spill(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
NodeColorspill *ncs= MEM_callocN(sizeof(NodeColorspill), "node colorspill");
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 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -46,6 +46,8 @@
{-1, 0, ""}
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
/* this function implements ASC-CDL according to the spec at http://www.asctech.org/
Slope
S = in * slope
@@ -174,6 +176,8 @@
}
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_colorbalance(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
NodeColorBalance *n= node->storage= MEM_callocN(sizeof(NodeColorBalance), "node colorbalance");
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c 2012-08-19 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -29,11 +29,8 @@
* \ingroup cmpnodes
*/
-
#include "node_composite_util.h"
-
-
/* **************** COMPOSITE ******************** */
static bNodeSocketTemplate cmp_node_composite_in[]= {
{ SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
@@ -42,6 +39,8 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
/* applies to render pipeline */
static void node_composit_exec_composite(void *data, bNode *node, bNodeStack **in, bNodeStack **UNUSED(out))
{
@@ -97,6 +96,8 @@
generate_preview(data, node, in[0]->data);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
void register_node_type_cmp_composite(bNodeTreeType *ttype)
{
static bNodeType ntype;
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c 2012-08-19 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -43,6 +43,8 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void node_composit_exec_crop(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
{
if (in[0]->data) {
@@ -101,6 +103,8 @@
}
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_crop(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
NodeTwoXYs *nxy= MEM_callocN(sizeof(NodeTwoXYs), "node xy data");
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c 2012-08-19 22:19:19 UTC (rev 50030)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c 2012-08-19 23:36:29 UTC (rev 50031)
@@ -41,6 +41,8 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
+
static void node_composit_exec_curves_time(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
{
RenderData *rd= data;
@@ -54,6 +56,7 @@
out[0]->vec[0]= CLAMPIS(fac, 0.0f, 1.0f);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list