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, 24 insertions, 32 deletions

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