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, 11 insertions, 17 deletions

diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c b/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
index c71d442cef3..67fb068870c 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
@@ -75,20 +75,14 @@ static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 	tex_output(node, in, out[0], &normalfn, data);
 }
 
-bNodeType tex_node_valtonor = {
-	/* *next,*prev     */ NULL, NULL,
-	/* type code       */ TEX_NODE_VALTONOR, 
-	/* name            */ "Value to Normal", 
-	/* width+range     */ 90, 80, 100, 
-	/* class+opts      */ NODE_CLASS_CONVERTOR, NODE_OPTIONS, 
-	/* input sock      */ inputs, 
-	/* output sock     */ outputs, 
-	/* storage         */ "", 
-	/* execfunc        */ exec,
-	/* butfunc         */ NULL,
-	/* initfunc        */ NULL,
-	/* freestoragefunc */ NULL,
-	/* copystoragefunc */ NULL,
-	/* id              */ NULL
-};
-
+void register_node_type_tex_valtonor(ListBase *lb)
+{
+	static bNodeType ntype;
+	
+	node_type_base(&ntype, TEX_NODE_VALTONOR, "Value to Normal", NODE_CLASS_CONVERTOR, NODE_OPTIONS,
+				   inputs, outputs);
+	node_type_size(&ntype, 90, 80, 100);
+	node_type_exec(&ntype, exec);
+	
+	nodeRegisterType(lb, &ntype);
+}