Cleanup: Use const arguments

Also remove unnecessary function to set a node type's
label function that duplicated its definition, and make
another function static.

4 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c
index bd8a844003f..f873ed5e457 100644
--- a/source/blender/nodes/texture/nodes/node_texture_common.c
+++ b/source/blender/nodes/texture/nodes/node_texture_common.c
@@ -172,7 +172,7 @@ void register_node_type_tex_group(void)
 
   node_type_socket_templates(&ntype, NULL, NULL);
   node_type_size(&ntype, 140, 60, 400);
-  node_type_label(&ntype, node_group_label);
+  ntype.labelfunc = node_group_label;
   node_type_group_update(&ntype, node_group_update);
   node_type_exec(&ntype, group_initexec, group_freeexec, group_execute);
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c
index a85b963286b..9c61405ea23 100644
--- a/source/blender/nodes/texture/nodes/node_texture_image.c
+++ b/source/blender/nodes/texture/nodes/node_texture_image.c
@@ -113,7 +113,7 @@ void register_node_type_tex_image(void)
   node_type_init(&ntype, init);
   node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
   node_type_exec(&ntype, NULL, NULL, exec);
-  node_type_label(&ntype, node_image_label);
+  ntype.labelfunc = node_image_label;
 
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index ab226a4dd38..9e37f4ee643 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -337,7 +337,7 @@ void register_node_type_tex_math(void)
 
   tex_node_type_base(&ntype, TEX_NODE_MATH, "Math", NODE_CLASS_CONVERTER, 0);
   node_type_socket_templates(&ntype, inputs, outputs);
-  node_type_label(&ntype, node_math_label);
+  ntype.labelfunc = node_math_label;
   node_type_storage(&ntype, "", NULL, NULL);
   node_type_exec(&ntype, NULL, NULL, exec);
   node_type_update(&ntype, node_math_update);
diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
index b1aeb269018..044875cce90 100644
--- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
@@ -71,7 +71,7 @@ void register_node_type_tex_mix_rgb(void)
 
   tex_node_type_base(&ntype, TEX_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, 0);
   node_type_socket_templates(&ntype, inputs, outputs);
-  node_type_label(&ntype, node_blend_label);
+  ntype.labelfunc = node_blend_label;
   node_type_exec(&ntype, NULL, NULL, exec);
 
   nodeRegisterType(&ntype);