[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43843] branches/tile/source/blender/nodes : Fixed registration functions for last section of compositor nodes in registerCompositNodes (dilate/erode 2, box mask, ellipse mask, bokeh image, bokeh blur, switch and opencl test).
Lukas Toenne
lukas.toenne at googlemail.com
Thu Feb 2 10:24:54 CET 2012
Revision: 43843
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43843
Author: lukastoenne
Date: 2012-02-02 09:24:48 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Fixed registration functions for last section of compositor nodes in registerCompositNodes (dilate/erode 2, box mask, ellipse mask, bokeh image, bokeh blur, switch and opencl test). The register functions need a tree type argument now instead of a plain ListBase.
Modified Paths:
--------------
branches/tile/source/blender/nodes/NOD_composite.h
branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_dilate2.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_opencltest.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c
Modified: branches/tile/source/blender/nodes/NOD_composite.h
===================================================================
--- branches/tile/source/blender/nodes/NOD_composite.h 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/NOD_composite.h 2012-02-02 09:24:48 UTC (rev 43843)
@@ -120,12 +120,12 @@
void register_node_type_cmp_tonemap(struct bNodeTreeType *ttype);
void register_node_type_cmp_lensdist(struct bNodeTreeType *ttype);
-void register_node_type_cmp_dilateerode2(ListBase *lb);
-void register_node_type_cmp_boxmask(ListBase *lb);
-void register_node_type_cmp_ellipsemask(ListBase *lb);
-void register_node_type_cmp_bokehimage(ListBase *lb);
-void register_node_type_cmp_bokehblur(ListBase *lb);
-void register_node_type_cmp_switch(ListBase *lb);
-void register_node_type_cmp_opencltest(ListBase *lb);
+void register_node_type_cmp_dilateerode2(struct bNodeTreeType *ttype);
+void register_node_type_cmp_boxmask(struct bNodeTreeType *ttype);
+void register_node_type_cmp_ellipsemask(struct bNodeTreeType *ttype);
+void register_node_type_cmp_bokehimage(struct bNodeTreeType *ttype);
+void register_node_type_cmp_bokehblur(struct bNodeTreeType *ttype);
+void register_node_type_cmp_switch(struct bNodeTreeType *ttype);
+void register_node_type_cmp_opencltest(struct bNodeTreeType *ttype);
#endif
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehblur.c 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehblur.c 2012-02-02 09:24:48 UTC (rev 43843)
@@ -48,15 +48,12 @@
{ -1, 0, "" }
};
-void register_node_type_cmp_bokehblur(ListBase *lb)
+void register_node_type_cmp_bokehblur(bNodeTreeType *ttype)
{
static bNodeType ntype;
- node_type_base(lb, &ntype, CMP_NODE_BOKEHBLUR, "Bokeh blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
+ node_type_base(ttype, &ntype, CMP_NODE_BOKEHBLUR, "Bokeh blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
node_type_socket_templates(&ntype, cmp_node_bokehblur_in, cmp_node_bokehblur_out);
node_type_size(&ntype, 120, 80, 200);
- nodeRegisterType(lb, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
-
-
-
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehimage.c 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehimage.c 2012-02-02 09:24:48 UTC (rev 43843)
@@ -55,15 +55,15 @@
node->storage= data;
}
-void register_node_type_cmp_bokehimage(ListBase *lb)
+void register_node_type_cmp_bokehimage(bNodeTreeType *ttype)
{
static bNodeType ntype;
- node_type_base(lb, &ntype, CMP_NODE_BOKEHIMAGE, "Bokeh image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
+ node_type_base(ttype, &ntype, CMP_NODE_BOKEHIMAGE, "Bokeh image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
node_type_socket_templates(&ntype, cmp_node_bokehimage_in, cmp_node_bokehimage_out);
node_type_size(&ntype, 140, 100, 320);
node_type_init(&ntype, node_composit_init_bokehimage);
node_type_storage(&ntype, "NodeBokehImage", node_free_standard_storage, node_copy_standard_storage);
- nodeRegisterType(lb, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_boxmask.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_boxmask.c 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_boxmask.c 2012-02-02 09:24:48 UTC (rev 43843)
@@ -57,17 +57,17 @@
node->storage = data;
}
-void register_node_type_cmp_boxmask(ListBase *lb)
+void register_node_type_cmp_boxmask(bNodeTreeType *ttype)
{
static bNodeType ntype;
- node_type_base(lb, &ntype, CMP_NODE_MASK_BOX, "Box mask", NODE_CLASS_MATTE, NODE_OPTIONS);
- node_type_socket_templates(&ntype, cmp_node_boxmask_in, cmp_node_boxmask_out);
+ node_type_base(ttype, &ntype, CMP_NODE_MASK_BOX, "Box mask", NODE_CLASS_MATTE, NODE_OPTIONS);
+ node_type_socket_templates(&ntype, cmp_node_boxmask_in, cmp_node_boxmask_out);
node_type_size(&ntype, 120, 110, 160);
- node_type_init(&ntype, node_composit_init_boxmask);
- node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage, node_copy_standard_storage);
+ node_type_init(&ntype, node_composit_init_boxmask);
+ node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage, node_copy_standard_storage);
- nodeRegisterType(lb, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_dilate2.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_dilate2.c 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_dilate2.c 2012-02-02 09:24:48 UTC (rev 43843)
@@ -55,17 +55,17 @@
node->storage = data;
}
-void register_node_type_cmp_dilateerode2(ListBase *lb)
+void register_node_type_cmp_dilateerode2(bNodeTreeType *ttype)
{
static bNodeType ntype;
- node_type_base(lb, &ntype, CMP_NODE_DILATEERODE2, "Dilate/Erode 2", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
- node_type_socket_templates(&ntype, cmp_node_dilateerode_in, cmp_node_dilateerode_out);
+ node_type_base(ttype, &ntype, CMP_NODE_DILATEERODE2, "Dilate/Erode 2", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
+ 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);
- node_type_storage(&ntype, "NodeDilateErode", node_free_standard_storage, node_copy_standard_storage);
+ node_type_init(&ntype, node_composit_init_dilateerode);
+ node_type_storage(&ntype, "NodeDilateErode", node_free_standard_storage, node_copy_standard_storage);
- nodeRegisterType(lb, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c 2012-02-02 09:24:48 UTC (rev 43843)
@@ -57,17 +57,17 @@
node->storage = data;
}
-void register_node_type_cmp_ellipsemask(ListBase *lb)
+void register_node_type_cmp_ellipsemask(bNodeTreeType *ttype)
{
static bNodeType ntype;
- node_type_base(lb, &ntype, CMP_NODE_MASK_ELLIPSE, "Ellipse mask", NODE_CLASS_MATTE, NODE_OPTIONS);
- node_type_socket_templates(&ntype, cmp_node_ellipsemask_in, cmp_node_ellipsemask_out);
+ node_type_base(ttype, &ntype, CMP_NODE_MASK_ELLIPSE, "Ellipse mask", NODE_CLASS_MATTE, NODE_OPTIONS);
+ node_type_socket_templates(&ntype, cmp_node_ellipsemask_in, cmp_node_ellipsemask_out);
node_type_size(&ntype, 120, 110, 160);
- node_type_init(&ntype, node_composit_init_ellipsemask);
- node_type_storage(&ntype, "NodeEllipseMask", node_free_standard_storage, node_copy_standard_storage);
+ node_type_init(&ntype, node_composit_init_ellipsemask);
+ node_type_storage(&ntype, "NodeEllipseMask", node_free_standard_storage, node_copy_standard_storage);
- nodeRegisterType(lb, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_opencltest.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_opencltest.c 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_opencltest.c 2012-02-02 09:24:48 UTC (rev 43843)
@@ -41,15 +41,15 @@
{ -1, 0, "" }
};
-void register_node_type_cmp_opencltest(ListBase *lb)
+void register_node_type_cmp_opencltest(bNodeTreeType *ttype)
{
static bNodeType ntype;
- node_type_base(lb, &ntype, CMP_NODE_OPENCLTEST, "OpenCL test", NODE_CLASS_INPUT, NODE_OPTIONS);
+ node_type_base(ttype, &ntype, CMP_NODE_OPENCLTEST, "OpenCL test", NODE_CLASS_INPUT, NODE_OPTIONS);
node_type_socket_templates(&ntype, NULL, cmp_node_opencltest_out);
node_type_size(&ntype, 140, 80, 140);
- nodeRegisterType(lb, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c 2012-02-02 08:48:43 UTC (rev 43842)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c 2012-02-02 09:24:48 UTC (rev 43843)
@@ -45,13 +45,13 @@
};
/* custom1 = mix type */
-void register_node_type_cmp_switch(ListBase *lb)
+void register_node_type_cmp_switch(bNodeTreeType *ttype)
{
static bNodeType ntype;
- node_type_base(lb, &ntype, CMP_NODE_SWITCH, "Switch", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
+ node_type_base(ttype, &ntype, CMP_NODE_SWITCH, "Switch", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, cmp_node_switch_in, cmp_node_switch_out);
node_type_size(&ntype, 110, 60, 120);
- nodeRegisterType(lb, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
More information about the Bf-blender-cvs
mailing list