[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50070] trunk/blender/source/blender: code cleanup: some legacy compo nodes were not ifdef'd
Campbell Barton
ideasman42 at gmail.com
Tue Aug 21 10:58:47 CEST 2012
Revision: 50070
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50070
Author: campbellbarton
Date: 2012-08-21 08:58:47 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
code cleanup: some legacy compo nodes were not ifdef'd
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_templates.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_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_keying.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -1757,7 +1757,7 @@
cumap->white[0] = cumap->white[1] = cumap->white[2] = 1.0f;
curvemapping_set_black_white(cumap, NULL, NULL);
- curvemapping_changed(cumap, 0);
+ curvemapping_changed(cumap, FALSE);
rna_update_cb(C, cb_v, NULL);
}
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-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -157,5 +157,6 @@
#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-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -278,5 +278,6 @@
#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-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -741,5 +741,6 @@
#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-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -106,6 +106,6 @@
#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_colorSpill.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -342,6 +342,6 @@
#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_composite.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -108,6 +108,7 @@
#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);
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_keying.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_keying.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_keying.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -60,9 +60,12 @@
{ -1, 0, "" }
};
-static void exec(void *UNUSED(data), bNode *UNUSED(node), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
+#ifdef WITH_COMPOSITOR_LEGACY
+static void node_composit_exec_keying(void *UNUSED(data), bNode *UNUSED(node), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
{
+ /* pass */
}
+#endif /* WITH_COMPOSITOR_LEGACY */
static void node_composit_init_keying(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
@@ -91,7 +94,9 @@
node_type_size(&ntype, 140, 100, 320);
node_type_init(&ntype, node_composit_init_keying);
node_type_storage(&ntype, "NodeKeyingData", node_free_standard_storage, node_copy_standard_storage);
- node_type_exec(&ntype, exec);
+#ifdef WITH_COMPOSITOR_LEGACY
+ node_type_exec(&ntype, node_composit_exec_keying);
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -50,6 +50,7 @@
{ -1, 0, "" }
};
+#ifdef WITH_COMPOSITOR_LEGACY
static void compute_gradient_screen(RenderData *rd, NodeKeyingScreenData *keyingscreen_data, MovieClip *clip, CompBuf *screenbuf)
{
@@ -157,7 +158,7 @@
BLI_freelistN(&edges);
}
-static void exec(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
+static void node_composit_exec_keyingscreen(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
{
NodeKeyingScreenData *keyingscreen_data = node->storage;
RenderData *rd = data;
@@ -178,6 +179,8 @@
out[0]->data = screenbuf;
}
+#endif /* WITH_COMPOSITOR_LEGACY */
+
static void node_composit_init_keyingscreen(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
NodeKeyingScreenData *data;
@@ -196,7 +199,9 @@
node_type_size(&ntype, 140, 100, 320);
node_type_init(&ntype, node_composit_init_keyingscreen);
node_type_storage(&ntype, "NodeKeyingScreenData", node_free_standard_storage, node_copy_standard_storage);
- node_type_exec(&ntype, exec);
+#ifdef WITH_COMPOSITOR_LEGACY
+ node_type_exec(&ntype, node_composit_exec_keyingscreen);
+#endif
nodeRegisterType(ttype, &ntype);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -45,7 +45,8 @@
{ -1, 0, "" }
};
-static void exec(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
+#ifdef WITH_COMPOSITOR_LEGACY
+static void node_composit_exec_mask(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
{
if (node->id) {
Mask *mask = (Mask *)node->id;
@@ -84,6 +85,7 @@
out[0]->data = stackbuf;
}
}
+#endif /* WITH_COMPOSITOR_LEGACY */
static void node_composit_init_mask(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
{
@@ -103,7 +105,9 @@
node_type_socket_templates(&ntype, NULL, cmp_node_mask_out);
node_type_size(&ntype, 140, 100, 320);
node_type_init(&ntype, node_composit_init_mask);
- node_type_exec(&ntype, exec);
+#ifdef WITH_COMPOSITOR_LEGACY
+ node_type_exec(&ntype, node_composit_exec_mask);
+#endif
node_type_storage(&ntype, "NodeMask", node_free_standard_storage, node_copy_standard_storage);
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -47,7 +47,8 @@
{ -1, 0, "" }
};
-static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
+#ifdef WITH_COMPOSITOR_LEGACY
+static void node_composit_exec_moviedistortion(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
{
if (in[0]->data) {
if (node->id) {
@@ -104,6 +105,7 @@
}
}
}
+#endif /* WITH_COMPOSITOR_LEGACY */
static const char *label(bNode *node)
{
@@ -135,7 +137,10 @@
node_type_socket_templates(&ntype, cmp_node_moviedistortion_in, cmp_node_moviedistortion_out);
node_type_size(&ntype, 140, 100, 320);
node_type_label(&ntype, label);
- node_type_exec(&ntype, exec);
+#ifdef WITH_COMPOSITOR_LEGACY
+ node_type_exec(&ntype, node_composit_exec_moviedistortion);
+#endif
+
node_type_storage(&ntype, NULL, storage_free, storage_copy);
nodeRegisterType(ttype, &ntype);
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c 2012-08-21 08:57:24 UTC (rev 50069)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c 2012-08-21 08:58:47 UTC (rev 50070)
@@ -227,6 +227,8 @@
}
}
+#ifdef WITH_COMPOSITOR_LEGACY
+
/* write input data into individual files */
static void exec_output_file_singlelayer(RenderData *rd, bNode *node, bNodeStack **in)
{
@@ -386,7 +388,7 @@
IMB_exr_close(exrhandle);
}
-static void exec_output_file(void *data, bNode *node, bNodeStack **in, bNodeStack **UNUSED(out))
+static void node_composit_exec_outputfile(void *data, bNode *node, bNodeStack **in, bNodeStack **UNUSED(out))
{
RenderData *rd= data;
NodeImageMultiFile *nimf= node->storage;
@@ -403,6 +405,7 @@
else
exec_output_file_singlelayer(rd, node, in);
}
+#endif /* WITH_COMPOSITOR_LEGACY */
void register_node_type_cmp_output_file(bNodeTreeType *ttype)
{
@@ -414,7 +417,9 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list