Finished the node type definition cleanup started in r34682. All static node types should now use the node_type_* definition helpers to initialize their bNodeType structs.

55 files changed, 811 insertions, 1031 deletions

diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c b/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
index 3f6bd989477..e8cfc8533d1 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
@@ -140,22 +140,19 @@ static void node_alphaover_init(bNode* node)
    node->storage= MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
 }
 
-bNodeType cmp_node_alphaover= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_ALPHAOVER,
-	/* name        */	"AlphaOver",
-	/* width+range */	80, 40, 120,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_alphaover_in,
-	/* output sock */	cmp_node_alphaover_out,
-	/* storage     */	"NodeTwoFloats",
-	/* execfunc    */	node_composit_exec_alphaover,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_alphaover_init,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_alphaover(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_ALPHAOVER, "AlphaOver", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_alphaover_in, cmp_node_alphaover_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_alphaover);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c b/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
index 404f0aefb3c..efa044158a2 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
@@ -250,20 +250,17 @@ static void node_composit_init_bilateralblur(bNode* node)
 	nbbd->sigma_space= 5.0;
 }
 
-bNodeType cmp_node_bilateralblur= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_BILATERALBLUR,
-	/* name        */	"Bilateral Blur",
-	/* width+range */	150, 120, 200,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_OPTIONS,
-	/* input sock  */	cmp_node_bilateralblur_in,
-	/* output sock */	cmp_node_bilateralblur_out,
-	/* storage     */	"NodeBilateralBlurData",
-	/* execfunc    */	node_composit_exec_bilateralblur,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_bilateralblur,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_bilateralblur(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS,
+		cmp_node_bilateralblur_in, cmp_node_bilateralblur_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_bilateralblur);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_blur.c b/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
index f367e7b473d..78a27bc5b16 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
@@ -704,21 +704,19 @@ static void node_composit_init_blur(bNode* node)
    node->storage= MEM_callocN(sizeof(NodeBlurData), "node blur data");
 }
 
-bNodeType cmp_node_blur= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_BLUR,
-	/* name        */	"Blur",
-	/* width+range */	120, 80, 200,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_blur_in,
-	/* output sock */	cmp_node_blur_out,
-	/* storage     */	"NodeBlurData",
-	/* execfunc    */	node_composit_exec_blur,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_blur,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_blur(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_blur_in, cmp_node_blur_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_blur);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c b/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
index 6b0d6ff45a0..f2f7636e96b 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
@@ -91,20 +91,15 @@ static void node_composit_exec_brightcontrast(void *UNUSED(data), bNode *node, b
 	}
 }
 
-bNodeType cmp_node_brightcontrast= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_BRIGHTCONTRAST,
-	/* name        */	"Bright/Contrast",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_brightcontrast_in,
-	/* output sock */	cmp_node_brightcontrast_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_brightcontrast,
-	/* butfunc     */	NULL, 
-	/* initfunc    */	NULL, 
-	/* freestoragefunc	*/ NULL, 
-	/* copysotragefunc	*/ NULL, 
-	/* id          */	NULL
-};
+void register_node_type_cmp_brightcontrast(ListBase *lb)
+{
+	static bNodeType ntype;
+	
+	node_type_base(&ntype, CMP_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+				   cmp_node_brightcontrast_in, cmp_node_brightcontrast_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_brightcontrast);
+	
+	nodeRegisterType(lb, &ntype);
+}
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
index 182c339132e..044ed6d069b 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
@@ -197,19 +197,17 @@ static void node_composit_init_channel_matte(bNode *node)
    node->custom2= 2; /* Green Channel */
 }
 
-bNodeType cmp_node_channel_matte={
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_CHANNEL_MATTE,
-	/* name        */	"Channel Key",
-	/* width+range */	200, 80, 250,
-	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_channel_matte_in,
-	/* output sock */	cmp_node_channel_matte_out,
-	/* storage     */	"NodeChroma",
-	/* execfunc    */	node_composit_exec_channel_matte,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_channel_matte,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_channel_matte(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_channel_matte_in, cmp_node_channel_matte_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_channel_matte);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
index d102afbbd16..eba2d55187e 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
@@ -184,21 +184,19 @@ static void node_composit_init_chroma_matte(bNode *node)
    c->fstrength= 1.0f;
 };
 
-bNodeType cmp_node_chroma_matte={
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_CHROMA_MATTE,
-	/* name        */	"Chroma Key",
-	/* width+range */	200, 80, 300,
-	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_chroma_in,
-	/* output sock */	cmp_node_chroma_out,
-	/* storage     */	"NodeChroma",
-	/* execfunc    */	node_composit_exec_chroma_matte,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_chroma_matte,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_chroma_matte(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_chroma_in, cmp_node_chroma_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_chroma_matte);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
index 8d5f4688657..57063465ac2 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
@@ -112,21 +112,19 @@ static void node_composit_init_color_matte(bNode *node)
    c->fstrength= 1.0f;
 };
 
-bNodeType cmp_node_color_matte={
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_COLOR_MATTE,
-	/* name        */	"Color Key",
-	/* width+range */	200, 80, 300,
-	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_color_in,
-	/* output sock */	cmp_node_color_out,
-	/* storage     */	"NodeChroma",
-	/* execfunc    */	node_composit_exec_color_matte,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_color_matte,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_color_matte(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_color_in, cmp_node_color_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_color_matte);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c b/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
index 408bda02ee4..e4b9ead504b 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
@@ -322,19 +322,16 @@ static void node_composit_init_color_spill(bNode *node)
    ncs->unspill=0;   /* do not use unspill */
 }
 
-bNodeType cmp_node_color_spill={
-   /* *next,*prev */	NULL, NULL,
-   /* type code   */	CMP_NODE_COLOR_SPILL,
-   /* name        */	"Color Spill",
-   /* width+range */	140, 80, 200,
-   /* class+opts  */	NODE_CLASS_MATTE, NODE_OPTIONS,
-   /* input sock  */	cmp_node_color_spill_in,
-   /* output sock */	cmp_node_color_spill_out,
-   /* storage     */	"NodeColorspill",
-   /* execfunc    */	node_composit_exec_color_spill,
-   /* butfunc     */	NULL,
-   /* initfunc    */	node_composit_init_color_spill,
-   /* freestoragefunc    */	node_free_standard_storage,
-   /* copystoragefunc    */	node_copy_standard_storage,
-};
-
+void register_node_type_cmp_color_spill(ListBase *lb)
+{
+	static bNodeType ntype;
+	
+	node_type_base(&ntype, CMP_NODE_COLOR_SPILL, "Color Spill", NODE_CLASS_MATTE, NODE_OPTIONS,
+				   cmp_node_color_spill_in, cmp_node_color_spill_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_color_spill);
+	
+	nodeRegisterType(lb, &ntype);
+}
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c b/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
index c8e0108a5c8..2596037065f 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
@@ -179,20 +179,18 @@ static void node_composit_init_colorbalance(bNode *node)
 	n->gain[0] = n->gain[1] = n->gain[2] = 1.0f;
 }
 
-bNodeType cmp_node_colorbalance={
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_COLORBALANCE,
-	/* name        */	"Color Balance",
-	/* width+range */	400, 200, 400,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_colorbalance_in,
-	/* output sock */	cmp_node_colorbalance_out,
-	/* storage     */	"NodeColorBalance",
-	/* execfunc    */	node_composit_exec_colorbalance,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_colorbalance,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_colorbalance(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_COLORBALANCE, "Color Balance", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_colorbalance_in, cmp_node_colorbalance_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_colorbalance);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_composite.c b/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
index ffb090f3a94..1bbcb0f7527 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
@@ -94,19 +94,15 @@ static void node_composit_exec_composite(void *data, bNode *node, bNodeStack **i
 		generate_preview(data, node, in[0]->data);
 }
 
-bNodeType cmp_node_composite= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_COMPOSITE,
-	/* name        */	"Composite",
-	/* width+range */	80, 60, 200,
-	/* class+opts  */	NODE_CLASS_OUTPUT, NODE_PREVIEW,
-	/* input sock  */	cmp_node_composite_in,
-	/* output sock */	NULL,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_composite,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_composite(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_COMPOSITE, "Composite", NODE_CLASS_OUTPUT, NODE_PREVIEW,
+		cmp_node_composite_in, NULL);
+	node_type_size(&ntype, 80, 60, 200);
+	node_type_exec(&ntype, node_composit_exec_composite);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_crop.c b/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
index 7ecfe40f739..b8d24fc1b14 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
@@ -108,19 +108,17 @@ static void node_composit_init_crop(bNode* node)
    nxy->y2= 0;
 }
 
-bNodeType cmp_node_crop= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_CROP,
-	/* name        */	"Crop",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_crop_in,
-	/* output sock */	cmp_node_crop_out,
-	/* storage     */	"NodeTwoXYs",
-	/* execfunc    */	node_composit_exec_crop,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_crop,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_crop(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_CROP, "Crop", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_crop_in, cmp_node_crop_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_crop);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_curves.c b/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
index 1a88e9541c6..2252bc2d181 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
@@ -59,22 +59,20 @@ static void node_composit_init_curves_time(bNode* node)
    node->storage= curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
-bNodeType cmp_node_curve_time= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_TIME,
-	/* name        */	"Time",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_INPUT, NODE_OPTIONS,
-	/* input sock  */	NULL,
-	/* output sock */	cmp_node_time_out,
-	/* storage     */	"CurveMapping",
-	/* execfunc    */	node_composit_exec_curves_time,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_curves_time,
-	/* freestoragefunc    */	node_free_curves,
-	/* copystoragefunc    */	node_copy_curves,
-	/* id          */	NULL
-};
+void register_node_type_cmp_curve_time(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_TIME, "Time", NODE_CLASS_INPUT, NODE_OPTIONS,
+		NULL, cmp_node_time_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_curves_time);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 
@@ -102,23 +100,20 @@ static void node_composit_init_curve_vec(bNode* node)
    node->storage= curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f);
 };
 
-bNodeType cmp_node_curve_vec= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_CURVE_VEC,
-	/* name        */	"Vector Curves",
-	/* width+range */	200, 140, 320,
-	/* class+opts  */	NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_curve_vec_in,
-	/* output sock */	cmp_node_curve_vec_out,
-	/* storage     */	"CurveMapping",
-	/* execfunc    */	node_composit_exec_curve_vec,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_curve_vec,
-	/* freestoragefunc    */	node_free_curves,
-	/* copystoragefunc    */	node_copy_curves,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_curve_vec(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_CURVE_VEC, "Vector Curves", NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
+		cmp_node_curve_vec_in, cmp_node_curve_vec_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_curve_vec);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 /* **************** CURVE RGB  ******************** */
 static bNodeSocketType cmp_node_curve_rgb_in[]= {
@@ -192,20 +187,18 @@ static void node_composit_init_curve_rgb(bNode* node)
    node->storage= curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
 };
 
-bNodeType cmp_node_curve_rgb= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_CURVE_RGB,
-	/* name        */	"RGB Curves",
-	/* width+range */	200, 140, 320,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_curve_rgb_in,
-	/* output sock */	cmp_node_curve_rgb_out,
-	/* storage     */	"CurveMapping",
-	/* execfunc    */	node_composit_exec_curve_rgb,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_curve_rgb,
-	/* freestoragefunc    */	node_free_curves,
-	/* copystoragefunc    */	node_copy_curves,
-	/* id          */	NULL
-};
+void register_node_type_cmp_curve_rgb(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_CURVE_RGB, "RGB Curves", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_curve_rgb_in, cmp_node_curve_rgb_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_curve_rgb);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c b/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
index d3fd7c8bcad..7f5d5df9d6f 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
@@ -869,21 +869,19 @@ static void node_composit_init_defocus(bNode* node)
    node->storage = nbd;
 }
 
-bNodeType cmp_node_defocus = {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_DEFOCUS,
-	/* name        */	"Defocus",
-	/* width+range */	150, 120, 200,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_OPTIONS,
-	/* input sock  */	cmp_node_defocus_in,
-	/* output sock */	cmp_node_defocus_out,
-	/* storage     */	"NodeDefocus",
-	/* execfunc    */	node_composit_exec_defocus,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_defocus,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_defocus(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_DEFOCUS, "Defocus", NODE_CLASS_OP_FILTER, NODE_OPTIONS,
+		cmp_node_defocus_in, cmp_node_defocus_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_defocus);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
index 0735a369d12..73046d70011 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
@@ -128,21 +128,19 @@ static void node_composit_init_diff_matte(bNode *node)
    c->t2= 0.1f;
 }
 
-bNodeType cmp_node_diff_matte={
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_DIFF_MATTE,
-	/* name        */	"Difference Key",
-	/* width+range */	200, 80, 250,
-	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_diff_matte_in,
-	/* output sock */	cmp_node_diff_matte_out,
-	/* storage     */	"NodeChroma",
-	/* execfunc    */	node_composit_exec_diff_matte,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_diff_matte,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_diff_matte(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_DIFF_MATTE, "Difference Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_diff_matte_in, cmp_node_diff_matte_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_diff_matte);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c b/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
index 71990b7403a..3ceaecfed43 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
@@ -143,21 +143,16 @@ static void node_composit_exec_dilateerode(void *UNUSED(data), bNode *node, bNod
 	}
 }
 
-bNodeType cmp_node_dilateerode= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_DILATEERODE,
-	/* name        */	"Dilate/Erode",
-	/* width+range */	130, 100, 320,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_OPTIONS,
-	/* input sock  */	cmp_node_dilateerode_in,
-	/* output sock */	cmp_node_dilateerode_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_dilateerode,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_dilateerode(ListBase *lb)
+{
+	static bNodeType ntype;
+	
+	node_type_base(&ntype, CMP_NODE_DILATEERODE, "Dilate/Erode", NODE_CLASS_OP_FILTER, NODE_OPTIONS,
+				   cmp_node_dilateerode_in, cmp_node_dilateerode_out);
+	node_type_size(&ntype, 130, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_dilateerode);
+	
+	nodeRegisterType(lb, &ntype);
+}
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c b/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
index 42bf48b9128..533a8b1324b 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
@@ -125,19 +125,17 @@ static void node_composit_init_dblur(bNode* node)
 	ndbd->center_y= 0.5;
 }
 
-bNodeType cmp_node_dblur = {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_DBLUR,
-	/* name        */	"Directional Blur",
-	/* width+range */	150, 120, 200,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_OPTIONS,
-	/* input sock  */	cmp_node_dblur_in,
-	/* output sock */	cmp_node_dblur_out,
-	/* storage     */	"NodeDBlurData",
-	/* execfunc    */	node_composit_exec_dblur,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_dblur,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_dblur(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_DBLUR, "Directional Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS,
+		cmp_node_dblur_in, cmp_node_dblur_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_dblur);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_displace.c b/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
index 1ce545e2ca8..7871efc30b7 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
@@ -171,20 +171,16 @@ static void node_composit_exec_displace(void *UNUSED(data), bNode *UNUSED(node),
 	}
 }
 
-bNodeType cmp_node_displace= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_DISPLACE,
-	/* name        */	"Displace",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_displace_in,
-	/* output sock */	cmp_node_displace_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_displace, 
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_displace(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_DISPLACE, "Displace", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_displace_in, cmp_node_displace_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_displace);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
index e0e595fc8f6..406f9e829c1 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
@@ -125,21 +125,19 @@ static void node_composit_init_distance_matte(bNode *node)
    c->t2= 0.1f;
 }
 
-bNodeType cmp_node_distance_matte={
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_DIST_MATTE,
-	/* name        */	"Distance Key",
-	/* width+range */	200, 80, 250,
-	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_distance_matte_in,
-	/* output sock */	cmp_node_distance_matte_out,
-	/* storage     */	"NodeChroma",
-	/* execfunc    */	node_composit_exec_distance_matte,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_distance_matte,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_distance_matte(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_DIST_MATTE, "Distance Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_distance_matte_in, cmp_node_distance_matte_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_distance_matte);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_filter.c b/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
index 8f9a988c4c2..f960f44d64d 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
@@ -217,22 +217,17 @@ static void node_composit_exec_filter(void *data, bNode *node, bNodeStack **in,
 }
 
 
-bNodeType cmp_node_filter= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_FILTER,
-	/* name        */	"Filter",
-	/* width+range */	80, 40, 120,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_filter_in,
-	/* output sock */	cmp_node_filter_out,
-	/* storage     */	"", 
-	/* execfunc    */	node_composit_exec_filter,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_filter(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_FILTER, "Filter", NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_filter_in, cmp_node_filter_out);
+	node_type_size(&ntype, 80, 40, 120);
+	node_type_exec(&ntype, node_composit_exec_filter);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_flip.c b/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
index 33a17f890d8..b0058765136 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
@@ -85,21 +85,17 @@ static void node_composit_exec_flip(void *UNUSED(data), bNode *node, bNodeStack
 	}
 }
 
-bNodeType cmp_node_flip= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_FLIP,
-	/* name        */	"Flip",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_flip_in,
-	/* output sock */	cmp_node_flip_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_flip,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_flip(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_FLIP, "Flip", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_flip_in, cmp_node_flip_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_flip);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c b/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
index 2e3162b0c30..98af5bff2ec 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
@@ -72,21 +72,14 @@ static void node_composit_exec_gamma(void *UNUSED(data), bNode *node, bNodeStack
 	}
 }
 
-bNodeType cmp_node_gamma= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_GAMMA,
-	/* name        */	"Gamma",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_gamma_in,
-	/* output sock */	cmp_node_gamma_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_gamma,	
-		/* butfunc     */       NULL,
-		/* initfunc    */       NULL,
-		/* freestoragefunc      */ NULL,
-		/* copysotragefunc      */ NULL,
-		/* id          */       NULL
-};
-
-
+void register_node_type_cmp_gamma(ListBase *lb)
+{
+	static bNodeType ntype;
+	
+	node_type_base(&ntype, CMP_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+				   cmp_node_gamma_in, cmp_node_gamma_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_gamma);
+	
+	nodeRegisterType(lb, &ntype);
+}
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_glare.c b/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
index d4968caee0f..1d7471680d0 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
@@ -484,19 +484,17 @@ static void node_composit_init_glare(bNode* node)
 	node->storage = ndg;
 }
 
-bNodeType cmp_node_glare = {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_GLARE,
-	/* name        */	"Glare",
-	/* width+range */	150, 120, 200,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_OPTIONS,
-	/* input sock  */	cmp_node_glare_in,
-	/* output sock */	cmp_node_glare_out,
-	/* storage     */	"NodeGlare",
-	/* execfunc    */	node_composit_exec_glare,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_glare,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_glare(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_GLARE, "Glare", NODE_CLASS_OP_FILTER, NODE_OPTIONS,
+		cmp_node_glare_in, cmp_node_glare_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_glare);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c b/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
index e8ce3e20f11..412ed5e6fa5 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
@@ -99,22 +99,19 @@ static void node_composit_init_hue_sat(bNode* node)
    nhs->val= 1.0f;
 }
 
-bNodeType cmp_node_hue_sat= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_HUE_SAT,
-	/* name        */	"Hue Saturation Value",
-	/* width+range */	150, 80, 250,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_hue_sat_in,
-	/* output sock */	cmp_node_hue_sat_out,
-	/* storage     */	"NodeHueSat", 
-	/* execfunc    */	node_composit_exec_hue_sat,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_hue_sat,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_hue_sat(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_HUE_SAT, "Hue Saturation Value", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_hue_sat_in, cmp_node_hue_sat_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_hue_sat);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c b/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
index ac009ccb69d..54503d23550 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
@@ -148,20 +148,18 @@ static void node_composit_init_huecorrect(bNode* node)
 	cumapping->cur = 1;
 }
 
-bNodeType cmp_node_huecorrect= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_HUECORRECT,
-	/* name        */	"Hue Correct",
-	/* width+range */	320, 140, 400,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_huecorrect_in,
-	/* output sock */	cmp_node_huecorrect_out,
-	/* storage     */	"CurveMapping",
-	/* execfunc    */	node_composit_exec_huecorrect,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_huecorrect,
-	/* freestoragefunc    */	node_free_curves,
-	/* copystoragefunc    */	node_copy_curves,
-	/* id          */	NULL
-};
+void register_node_type_cmp_huecorrect(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_HUECORRECT, "Hue Correct", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_huecorrect_in, cmp_node_huecorrect_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_huecorrect);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c b/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
index 9b088cb3f55..8b422012cec 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
@@ -104,21 +104,17 @@ static void node_composit_exec_idmask(void *data, bNode *node, bNodeStack **in,
 }
 
 
-bNodeType cmp_node_idmask= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_ID_MASK,
-	/* name        */	"ID Mask",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_idmask_in,
-	/* output sock */	cmp_node_idmask_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_idmask,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_idmask(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_ID_MASK, "ID Mask", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_idmask_in, cmp_node_idmask_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_idmask);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_image.c b/source/blender/nodes/intern/CMP_nodes/CMP_image.c
index dcf9a059c83..a0ac8d90bfa 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_image.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_image.c
@@ -297,22 +297,20 @@ static void node_composit_init_image(bNode* node)
    iuser->ok= 1;
 }
 
-bNodeType cmp_node_image= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_IMAGE,
-	/* name        */	"Image",
-	/* width+range */	120, 80, 300,
-	/* class+opts  */	NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	NULL,
-	/* output sock */	cmp_node_rlayers_out,
-	/* storage     */	"ImageUser",
-	/* execfunc    */	node_composit_exec_image,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_image,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_image(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_IMAGE, "Image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS,
+		NULL, cmp_node_rlayers_out);
+	node_type_size(&ntype, 120, 80, 300);
+	node_type_init(&ntype, node_composit_init_image);
+	node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
+	node_type_exec(&ntype, node_composit_exec_image);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 /* **************** RENDER RESULT ******************** */
 
@@ -428,22 +426,17 @@ static void node_composit_exec_rlayers(void *data, bNode *node, bNodeStack **UNU
 };
 
 
-bNodeType cmp_node_rlayers= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_R_LAYERS,
-	/* name        */	"Render Layers",
-	/* width+range */	150, 100, 300,
-	/* class+opts  */	NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	NULL,
-	/* output sock */	cmp_node_rlayers_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_rlayers,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+void register_node_type_cmp_rlayers(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_R_LAYERS, "Render Layers", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS,
+		NULL, cmp_node_rlayers_out);
+	node_type_size(&ntype, 150, 100, 300);
+	node_type_exec(&ntype, node_composit_exec_rlayers);
+
+	nodeRegisterType(lb, &ntype);
+}
 
-};
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_invert.c b/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
index 7ea146c7d4d..a60edd5ac7d 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
@@ -115,20 +115,16 @@ static void node_composit_init_invert(bNode *node)
 }
 
 /* custom1 = mix type */
-bNodeType cmp_node_invert= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_INVERT,
-	/* name        */	"Invert",
-	/* width+range */	120, 120, 140,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_invert_in,
-	/* output sock */	cmp_node_invert_out,
-	/* storage     */	"", 
-	/* execfunc    */	node_composit_exec_invert,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_invert,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_invert(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_INVERT, "Invert", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_invert_in, cmp_node_invert_out);
+	node_type_size(&ntype, 120, 120, 140);
+	node_type_init(&ntype, node_composit_init_invert);
+	node_type_exec(&ntype, node_composit_exec_invert);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c b/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
index b6e1fffcce8..159bc859450 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
@@ -174,19 +174,17 @@ static void node_composit_init_lensdist(bNode* node)
 }
 
 
-bNodeType cmp_node_lensdist = {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_LENSDIST,
-	/* name        */	"Lens Distortion",
-	/* width+range */	150, 120, 200,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_lensdist_in,
-	/* output sock */	cmp_node_lensdist_out,
-	/* storage     */	"NodeLensDist",
-	/* execfunc    */	node_composit_exec_lensdist,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_lensdist,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_lensdist(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_LENSDIST, "Lens Distortion", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_lensdist_in, cmp_node_lensdist_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_lensdist);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_levels.c b/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
index f4934b4b57b..71170d1633e 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
@@ -328,21 +328,18 @@ static void node_composit_init_view_levels(bNode* node)
    node->custom1=1; /*All channels*/
 }
 
-bNodeType cmp_node_view_levels= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_VIEW_LEVELS,
-	/* name        */	"Levels",
-	/* widthrange */	140, 100, 320,
-	/* classopts  */	NODE_CLASS_OUTPUT, NODE_OPTIONS|NODE_PREVIEW,
-	/* input sock  */	cmp_node_view_levels_in,
-	/* output sock */	cmp_node_view_levels_out,
-	/* storage     */	"ImageUser",
-	/* execfunc    */	node_composit_exec_view_levels,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_view_levels,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_view_levels(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_VIEW_LEVELS, "Levels", NODE_CLASS_OUTPUT, NODE_OPTIONS|NODE_PREVIEW,
+		cmp_node_view_levels_in, cmp_node_view_levels_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_init(&ntype, node_composit_init_view_levels);
+	node_type_storage(&ntype, "ImageUser", NULL, NULL);
+	node_type_exec(&ntype, node_composit_exec_view_levels);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
index af198fba699..91edb48415b 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
@@ -103,20 +103,18 @@ static void node_composit_init_luma_matte(bNode *node)
    c->t2= 0.0f;
 };
 
-bNodeType cmp_node_luma_matte={
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_LUMA_MATTE,
-	/* name        */	"Luminance Key",
-	/* width+range */	200, 80, 250,
-	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_luma_matte_in,
-	/* output sock */	cmp_node_luma_matte_out,
-	/* storage     */	"NodeChroma",
-	/* execfunc    */	node_composit_exec_luma_matte,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_luma_matte,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_luma_matte(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_LUMA_MATTE, "Luminance Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_luma_matte_in, cmp_node_luma_matte_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_luma_matte);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c b/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
index c605a661556..f0e0aec37b9 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
@@ -159,21 +159,17 @@ static void node_composit_exec_mapuv(void *UNUSED(data), bNode *node, bNodeStack
 	}
 }
 
-bNodeType cmp_node_mapuv= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_MAP_UV,
-	/* name        */	"Map UV",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_mapuv_in,
-	/* output sock */	cmp_node_mapuv_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_mapuv,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_mapuv(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_MAP_UV, "Map UV", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_mapuv_in, cmp_node_mapuv_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_mapuv);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c b/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
index 92709025a84..550e4a2e870 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
@@ -79,23 +79,20 @@ static void node_composit_init_map_value(bNode* node)
    node->storage= add_mapping();
 }
 
-bNodeType cmp_node_map_value= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_MAP_VALUE,
-	/* name        */	"Map Value",
-	/* width+range */	100, 60, 150,
-	/* class+opts  */	NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_map_value_in,
-	/* output sock */	cmp_node_map_value_out,
-	/* storage     */	"TexMapping",
-	/* execfunc    */	node_composit_exec_map_value,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_map_value,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_map_value(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_MAP_VALUE, "Map Value", NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
+		cmp_node_map_value_in, cmp_node_map_value_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_map_value);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_math.c b/source/blender/nodes/intern/CMP_nodes/CMP_math.c
index 98bbbf6c752..54ece02582d 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_math.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_math.c
@@ -181,22 +181,18 @@ static void node_composit_exec_math(void *UNUSED(data), bNode *node, bNodeStack
 	out[0]->data= stackbuf;
 }
 
-bNodeType cmp_node_math= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_MATH,
-	/* name        */	"Math",
-	/* width+range */	120, 110, 160,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_math_in,
-	/* output sock */	cmp_node_math_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_math,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_math(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_MATH, "Math", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_math_in, cmp_node_math_out);
+	node_type_size(&ntype, 120, 110, 160);
+	node_type_exec(&ntype, node_composit_exec_math);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c b/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
index 34d6713d9e3..b65296ffe10 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
@@ -79,20 +79,15 @@ static void node_composit_exec_mix_rgb(void *data, bNode *node, bNodeStack **in,
 }
 
 /* custom1 = mix type */
-bNodeType cmp_node_mix_rgb= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_MIX_RGB,
-	/* name        */	"Mix",
-	/* width+range */	110, 60, 120,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_mix_rgb_in,
-	/* output sock */	cmp_node_mix_rgb_out,
-	/* storage     */	"", 
-	/* execfunc    */	node_composit_exec_mix_rgb,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_mix_rgb(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_mix_rgb_in, cmp_node_mix_rgb_out);
+	node_type_size(&ntype, 110, 60, 120);
+	node_type_exec(&ntype, node_composit_exec_mix_rgb);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_normal.c b/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
index 04162956ac3..5b218f4d486 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
@@ -77,21 +77,16 @@ static void node_composit_exec_normal(void *UNUSED(data), bNode *node, bNodeStac
 	
 }
 
-bNodeType cmp_node_normal= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_NORMAL,
-	/* name        */	"Normal",
-	/* width+range */	100, 60, 200,
-	/* class+opts  */	NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_normal_in,
-	/* output sock */	cmp_node_normal_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_normal,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_normal(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_NORMAL, "Normal", NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
+		cmp_node_normal_in, cmp_node_normal_out);
+	node_type_size(&ntype, 100, 60, 200);
+	node_type_exec(&ntype, node_composit_exec_normal);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c b/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
index 07a11cdc997..1c92eb6519e 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
@@ -98,19 +98,15 @@ static void node_composit_exec_normalize(void *UNUSED(data), bNode *node, bNodeS
 	}
 }
 
-bNodeType cmp_node_normalize= {
-	/* *next, *prev*/   NULL, NULL,
-	/* type code   */   CMP_NODE_NORMALIZE,
-	/* name        */   "Normalize",
-	/* width+range */   100, 60, 150,
-	/* class+opts  */   NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
-	/* input sock  */   cmp_node_normalize_in,
-	/* output sock */   cmp_node_normalize_out,
-	/* storage     */   "TexMapping",
-	/* execfunc    */   node_composit_exec_normalize, 
-	/* butfunc     */   NULL, 
-	/* initfunc    */   NULL, 
-	/* freestoragefunc	*/ NULL, 
-	/* copystoragefunc	*/ NULL, 
-	/* id		*/	NULL
-};
+void register_node_type_cmp_normalize(ListBase *lb)
+{
+	static bNodeType ntype;
+	
+	node_type_base(&ntype, CMP_NODE_NORMALIZE, "Normalize", NODE_CLASS_OP_VECTOR, NODE_OPTIONS,
+				   cmp_node_normalize_in, cmp_node_normalize_out);
+	node_type_size(&ntype, 100, 60, 150);
+	node_type_exec(&ntype, node_composit_exec_normalize);
+	node_type_storage(&ntype, "TexMapping", NULL, NULL);
+	
+	nodeRegisterType(lb, &ntype);
+}
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c b/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
index 0129c1bb03d..701a3910be9 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
@@ -104,22 +104,19 @@ static void node_composit_init_output_file(bNode *node)
 	}
 }
 
-bNodeType cmp_node_output_file= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_OUTPUT_FILE,
-	/* name        */	"File Output",
-	/* width+range */	140, 80, 300,
-	/* class+opts  */	NODE_CLASS_OUTPUT, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_output_file_in,
-	/* output sock */	NULL,
-	/* storage     */	"NodeImageFile",
-	/* execfunc    */	node_composit_exec_output_file,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_output_file,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_output_file(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_output_file_in, NULL);
+	node_type_size(&ntype, 140, 80, 300);
+	node_type_init(&ntype, node_composit_init_output_file);
+	node_type_storage(&ntype, "NodeImageFile", node_free_standard_storage, node_copy_standard_storage);
+	node_type_exec(&ntype, node_composit_exec_output_file);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c b/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
index 1aa2e338f94..d64a2cee453 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
@@ -58,20 +58,16 @@ static void node_composit_exec_premulkey(void *UNUSED(data), bNode *node, bNodeS
 	}
 }
 
-bNodeType cmp_node_premulkey= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_PREMULKEY,
-	/* name        */	"Alpha Convert",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_premulkey_in,
-	/* output sock */	cmp_node_premulkey_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_premulkey,
-	/* butfunc     */	NULL, 
-	/* initfunc    */	NULL, 
-	/* freestoragefunc	*/ NULL, 
-	/* copysotragefunc	*/ NULL, 
-	/* id          */	NULL
-};
+void register_node_type_cmp_premulkey(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_PREMULKEY, "Alpha Convert", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_premulkey_in, cmp_node_premulkey_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_premulkey);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c b/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
index 5fbed05ac8d..975d9cae219 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
@@ -43,22 +43,17 @@ static void node_composit_exec_rgb(void *UNUSED(data), bNode *node, bNodeStack *
 	VECCOPY(out[0]->vec, sock->ns.vec);
 }
 
-bNodeType cmp_node_rgb= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_RGB,
-	/* name        */	"RGB",
-	/* width+range */	140, 80, 140,
-	/* class+opts  */	NODE_CLASS_INPUT, NODE_OPTIONS,
-	/* input sock  */	NULL,
-	/* output sock */	cmp_node_rgb_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_rgb,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_rgb(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_RGB, "RGB", NODE_CLASS_INPUT, NODE_OPTIONS,
+		NULL, cmp_node_rgb_out);
+	node_type_size(&ntype, 140, 80, 140);
+	node_type_exec(&ntype, node_composit_exec_rgb);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c b/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
index 8fed6972c20..ff8a2460efc 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
@@ -120,19 +120,16 @@ static void node_composit_init_rotate(bNode *node)
    node->custom1= 1; /* Bilinear Filter*/
 }
 
-bNodeType cmp_node_rotate= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_ROTATE,
-	/* name        */	"Rotate",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_rotate_in,
-	/* output sock */	cmp_node_rotate_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_rotate,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_rotate,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_rotate(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_ROTATE, "Rotate", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_rotate_in, cmp_node_rotate_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_init(&ntype, node_composit_init_rotate);
+	node_type_exec(&ntype, node_composit_exec_rotate);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_scale.c b/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
index 40785f3bc77..a524f4cb29b 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
@@ -109,22 +109,18 @@ static void node_composit_exec_scale(void *data, bNode *node, bNodeStack **in, b
 	}
 };
 
-bNodeType cmp_node_scale= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_SCALE,
-	/* name        */	"Scale",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_scale_in,
-	/* output sock */	cmp_node_scale_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_scale,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_scale(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_SCALE, "Scale", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_scale_in, cmp_node_scale_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_scale);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
index ef8723fd4e9..040a88bc37b 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
@@ -96,23 +96,18 @@ static void node_composit_exec_sephsva(void *UNUSED(data), bNode *node, bNodeSta
 	}
 }
 
-bNodeType cmp_node_sephsva= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_SEPHSVA,
-	/* name        */	"Separate HSVA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, 0,
-	/* input sock  */	cmp_node_sephsva_in,
-	/* output sock */	cmp_node_sephsva_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_sephsva,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_sephsva(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_SEPHSVA, "Separate HSVA", NODE_CLASS_CONVERTOR, 0,
+		cmp_node_sephsva_in, cmp_node_sephsva_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_sephsva);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 /* **************** COMBINE HSVA ******************** */
 static bNodeSocketType cmp_node_combhsva_in[]= {
@@ -171,21 +166,17 @@ static void node_composit_exec_combhsva(void *UNUSED(data), bNode *node, bNodeSt
    }	
 }
 
-bNodeType cmp_node_combhsva= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_COMBHSVA,
-	/* name        */	"Combine HSVA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_combhsva_in,
-	/* output sock */	cmp_node_combhsva_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_combhsva,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_combhsva(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_COMBHSVA, "Combine HSVA", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_combhsva_in, cmp_node_combhsva_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_combhsva);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
index 36603785bb3..1062344db39 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
@@ -74,23 +74,18 @@ static void node_composit_exec_seprgba(void *UNUSED(data), bNode *UNUSED(node),
 	}
 }
 
-bNodeType cmp_node_seprgba= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_SEPRGBA,
-	/* name        */	"Separate RGBA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, 0,
-	/* input sock  */	cmp_node_seprgba_in,
-	/* output sock */	cmp_node_seprgba_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_seprgba,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_seprgba(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_SEPRGBA, "Separate RGBA", NODE_CLASS_CONVERTOR, 0,
+		cmp_node_seprgba_in, cmp_node_seprgba_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_seprgba);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 /* **************** COMBINE RGBA ******************** */
@@ -147,21 +142,16 @@ static void node_composit_exec_combrgba(void *UNUSED(data), bNode *node, bNodeSt
 	}	
 }
 
-bNodeType cmp_node_combrgba= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_COMBRGBA,
-	/* name        */	"Combine RGBA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_combrgba_in,
-	/* output sock */	cmp_node_combrgba_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_combrgba,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_combrgba(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_COMBRGBA, "Combine RGBA", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_combrgba_in, cmp_node_combrgba_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_combrgba);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
index 895d7799796..364457fc5fa 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
@@ -145,22 +145,18 @@ static void node_composit_exec_sepycca(void *UNUSED(data), bNode *node, bNodeSta
 	}
 }
 
-bNodeType cmp_node_sepycca= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_SEPYCCA,
-	/* name        */	"Separate YCbCrA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_sepycca_in,
-	/* output sock */	cmp_node_sepycca_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_sepycca,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_sepycca(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_SEPYCCA, "Separate YCbCrA", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_sepycca_in, cmp_node_sepycca_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_sepycca);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 /* **************** COMBINE YCCA ******************** */
@@ -296,21 +292,17 @@ static void node_composit_exec_combycca(void *UNUSED(data), bNode *node, bNodeSt
 	}	
 }
 
-bNodeType cmp_node_combycca= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_COMBYCCA,
-	/* name        */	"Combine YCbCrA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_combycca_in,
-	/* output sock */	cmp_node_combycca_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_combycca,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_combycca(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_COMBYCCA, "Combine YCbCrA", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_combycca_in, cmp_node_combycca_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_combycca);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
index 333a4a2596e..99a625042df 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
@@ -96,22 +96,18 @@ static void node_composit_exec_sepyuva(void *UNUSED(data), bNode *node, bNodeSta
 	}
 }
 
-bNodeType cmp_node_sepyuva= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_SEPYUVA,
-	/* name        */	"Separate YUVA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, 0,
-	/* input sock  */	cmp_node_sepyuva_in,
-	/* output sock */	cmp_node_sepyuva_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_sepyuva,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_sepyuva(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_SEPYUVA, "Separate YUVA", NODE_CLASS_CONVERTOR, 0,
+		cmp_node_sepyuva_in, cmp_node_sepyuva_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_sepyuva);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 /* **************** COMBINE YUVA ******************** */
@@ -171,20 +167,16 @@ static void node_composit_exec_combyuva(void *UNUSED(data), bNode *node, bNodeSt
 	}	
 }
 
-bNodeType cmp_node_combyuva= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_COMBYUVA,
-	/* name        */	"Combine YUVA",
-	/* width+range */	80, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_combyuva_in,
-	/* output sock */	cmp_node_combyuva_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_combyuva,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_combyuva(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_COMBYUVA, "Combine YUVA", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_combyuva_in, cmp_node_combyuva_out);
+	node_type_size(&ntype, 80, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_combyuva);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c b/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
index f4c5603ce49..106203ded7a 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
@@ -70,20 +70,15 @@ static void node_composit_exec_setalpha(void *UNUSED(data), bNode *node, bNodeSt
 	}
 }
 
-bNodeType cmp_node_setalpha= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_SETALPHA,
-	/* name        */	"Set Alpha",
-	/* width+range */	120, 40, 140,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_setalpha_in,
-	/* output sock */	cmp_node_setalpha_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_setalpha,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_setalpha(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_SETALPHA, "Set Alpha", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_setalpha_in, cmp_node_setalpha_out);
+	node_type_size(&ntype, 120, 40, 140);
+	node_type_exec(&ntype, node_composit_exec_setalpha);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c b/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
index efb8c12fa84..1bb0cdfcd10 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
@@ -146,22 +146,20 @@ static void node_composit_init_splitviewer(bNode* node)
    node->custom1= 50;	/* default 50% split */
 }
 
-bNodeType cmp_node_splitviewer= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_SPLITVIEWER,
-	/* name        */	"SplitViewer",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_OUTPUT, NODE_PREVIEW|NODE_OPTIONS,
-	/* input sock  */	cmp_node_splitviewer_in,
-	/* output sock */	NULL,
-	/* storage     */	"ImageUser",
-	/* execfunc    */	node_composit_exec_splitviewer,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_splitviewer,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_splitviewer(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_SPLITVIEWER, "SplitViewer", NODE_CLASS_OUTPUT, NODE_PREVIEW|NODE_OPTIONS,
+		cmp_node_splitviewer_in, NULL);
+	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);
+	node_type_exec(&ntype, node_composit_exec_splitviewer);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_texture.c b/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
index b2510917ba1..63a43352b2a 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
@@ -139,22 +139,17 @@ static void node_composit_exec_texture(void *data, bNode *node, bNodeStack **in,
 	}
 }
 
-bNodeType cmp_node_texture= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_TEXTURE,
-	/* name        */	"Texture",
-	/* width+range */	120, 80, 240,
-	/* class+opts  */	NODE_CLASS_INPUT, NODE_OPTIONS|NODE_PREVIEW,
-	/* input sock  */	cmp_node_texture_in,
-	/* output sock */	cmp_node_texture_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_texture,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_texture(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT, NODE_OPTIONS|NODE_PREVIEW,
+		cmp_node_texture_in, cmp_node_texture_out);
+	node_type_size(&ntype, 120, 80, 240);
+	node_type_exec(&ntype, node_composit_exec_texture);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c b/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
index 49031e1625a..d58f0e827c2 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
@@ -158,19 +158,17 @@ static void node_composit_init_tonemap(bNode* node)
 	node->storage = ntm;
 }
 
-bNodeType cmp_node_tonemap = {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_TONEMAP,
-	/* name        */	"Tonemap",
-	/* width+range */	150, 120, 200,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_tonemap_in,
-	/* output sock */	cmp_node_tonemap_out,
-	/* storage     */	"NodeTonemap",
-	/* execfunc    */	node_composit_exec_tonemap,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_tonemap,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_tonemap(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_TONEMAP, "Tonemap", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_tonemap_in, cmp_node_tonemap_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_tonemap);
+
+	nodeRegisterType(lb, &ntype);
+}
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_translate.c b/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
index 0d8ad41d2dd..cad4d79b75c 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
@@ -56,20 +56,16 @@ static void node_composit_exec_translate(void *UNUSED(data), bNode *UNUSED(node)
 	}
 }
 
-bNodeType cmp_node_translate= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_TRANSLATE,
-	/* name        */	"Translate",
-	/* width+range */	140, 100, 320,
-	/* class+opts  */	NODE_CLASS_DISTORT, NODE_OPTIONS,
-	/* input sock  */	cmp_node_translate_in,
-	/* output sock */	cmp_node_translate_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_translate,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_translate(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_TRANSLATE, "Translate", NODE_CLASS_DISTORT, NODE_OPTIONS,
+		cmp_node_translate_in, cmp_node_translate_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, node_composit_exec_translate);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c b/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
index 7e0ecbcb888..2000e411f8c 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
@@ -80,23 +80,20 @@ static void node_composit_init_valtorgb(bNode* node)
    node->storage= add_colorband(1);
 }
 
-bNodeType cmp_node_valtorgb= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_VALTORGB,
-	/* name        */	"ColorRamp",
-	/* width+range */	240, 200, 300,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_valtorgb_in,
-	/* output sock */	cmp_node_valtorgb_out,
-	/* storage     */	"ColorBand",
-	/* execfunc    */	node_composit_exec_valtorgb,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_valtorgb,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_valtorgb(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_VALTORGB, "ColorRamp", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+		cmp_node_valtorgb_in, cmp_node_valtorgb_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_valtorgb);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
 
 /* **************** RGBTOBW ******************** */
@@ -137,21 +134,14 @@ static void node_composit_exec_rgbtobw(void *UNUSED(data), bNode *node, bNodeSta
 	}
 }
 
-bNodeType cmp_node_rgbtobw= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_RGBTOBW,
-	/* name        */	"RGB to BW",
-	/* width+range */	80, 40, 120,
-	/* class+opts  */	NODE_CLASS_CONVERTOR, 0,
-	/* input sock  */	cmp_node_rgbtobw_in,
-	/* output sock */	cmp_node_rgbtobw_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_rgbtobw,
-	/* butfunc     */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+void register_node_type_cmp_rgbtobw(ListBase *lb)
+{
+	static bNodeType ntype;
 	
-};
-
-
+	node_type_base(&ntype, CMP_NODE_RGBTOBW, "RGB to BW", NODE_CLASS_CONVERTOR, 0,
+				   cmp_node_rgbtobw_in, cmp_node_rgbtobw_out);
+	node_type_size(&ntype, 80, 40, 120);
+	node_type_exec(&ntype, node_composit_exec_rgbtobw);
+	
+	nodeRegisterType(lb, &ntype);
+}
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_value.c b/source/blender/nodes/intern/CMP_nodes/CMP_value.c
index a37742c77e9..787c9135898 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_value.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_value.c
@@ -42,20 +42,16 @@ static void node_composit_exec_value(void *UNUSED(data), bNode *node, bNodeStack
 	out[0]->vec[0]= sock->ns.vec[0];
 }
 
-bNodeType cmp_node_value= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_VALUE,
-	/* name        */	"Value",
-	/* width+range */	80, 40, 120,
-	/* class+opts  */	NODE_CLASS_INPUT, NODE_OPTIONS,
-	/* input sock  */	NULL,
-	/* output sock */	cmp_node_value_out,
-	/* storage     */	"", 
-	/* execfunc    */	node_composit_exec_value, 
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-};
+void register_node_type_cmp_value(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_VALUE, "Value", NODE_CLASS_INPUT, NODE_OPTIONS,
+		NULL, cmp_node_value_out);
+	node_type_size(&ntype, 80, 40, 120);
+	node_type_exec(&ntype, node_composit_exec_value);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c b/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
index 9ea626e39d6..71c8c48db7a 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
@@ -91,20 +91,18 @@ static void node_composit_init_vecblur(bNode* node)
 };
 
 /* custom1: itterations, custom2: maxspeed (0 = nolimit) */
-bNodeType cmp_node_vecblur= {
-	/* next, prev  */	NULL, NULL,
-	/* type code   */	CMP_NODE_VECBLUR,
-	/* name        */	"Vector Blur",
-	/* width+range */	120, 80, 200,
-	/* class+opts  */	NODE_CLASS_OP_FILTER, NODE_OPTIONS,
-	/* input sock  */	cmp_node_vecblur_in,
-	/* output sock */	cmp_node_vecblur_out,
-	/* storage     */	"NodeBlurData",
-	/* execfunc    */	node_composit_exec_vecblur,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_vecblur,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-};
+void register_node_type_cmp_vecblur(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_VECBLUR, "Vector Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS,
+		cmp_node_vecblur_in, cmp_node_vecblur_out);
+	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);
+	node_type_exec(&ntype, node_composit_exec_vecblur);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c b/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
index 24d8a9eb09e..f23a82e1dc2 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
@@ -128,21 +128,18 @@ static void node_composit_init_viewer(bNode* node)
    iuser->ok= 1;
 }
 
-bNodeType cmp_node_viewer= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_VIEWER,
-	/* name        */	"Viewer",
-	/* width+range */	80, 60, 200,
-	/* class+opts  */	NODE_CLASS_OUTPUT, NODE_PREVIEW,
-	/* input sock  */	cmp_node_viewer_in,
-	/* output sock */	NULL,
-	/* storage     */	"ImageUser",
-	/* execfunc    */	node_composit_exec_viewer,
-	/* butfunc     */	NULL,
-	/* initfunc    */	node_composit_init_viewer,
-	/* freestoragefunc    */	node_free_standard_storage,
-	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_viewer(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_VIEWER, "Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW,
+		cmp_node_viewer_in, NULL);
+	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);
+	node_type_exec(&ntype, node_composit_exec_viewer);
+
+	nodeRegisterType(lb, &ntype);
+}
+
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c b/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
index 17d88543698..675eae74a53 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
@@ -219,20 +219,15 @@ static void node_composit_exec_zcombine(void *data, bNode *node, bNodeStack **in
 
 }
 
-bNodeType cmp_node_zcombine= {
-	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_ZCOMBINE,
-	/* name        */	"Z Combine",
-	/* width+range */	80, 40, 120,
-	/* class+opts  */	NODE_CLASS_OP_COLOR, NODE_OPTIONS,
-	/* input sock  */	cmp_node_zcombine_in,
-	/* output sock */	cmp_node_zcombine_out,
-	/* storage     */	"",
-	/* execfunc    */	node_composit_exec_zcombine,
-	/* butfunc     */	NULL,
-	/* initfunc    */	NULL,
-	/* freestoragefunc    */	NULL,
-	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
-};
+void register_node_type_cmp_zcombine(ListBase *lb)
+{
+	static bNodeType ntype;
+
+	node_type_base(&ntype, CMP_NODE_ZCOMBINE, "Z Combine", NODE_CLASS_OP_COLOR, NODE_OPTIONS,
+		cmp_node_zcombine_in, cmp_node_zcombine_out);
+	node_type_size(&ntype, 80, 40, 120);
+	node_type_exec(&ntype, node_composit_exec_zcombine);
+
+	nodeRegisterType(lb, &ntype);
+}
+