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.

1 files changed, 14 insertions, 16 deletions

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);
+}
+