Make dynamic node labels possible as a registerable function 'draw_label' (simple 'label' identifier is already in use, need to avoid API breakage). This should simply return a string. The dynamic label can still be overridden by the user-defined node.label string.

5 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
index 4d4781a4ffa..1d411aafe68 100644
--- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
+++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
@@ -48,7 +48,7 @@ static bNodeSocketTemplate cmp_node_moviedistortion_out[] = {
 	{	-1, 0, ""	}
 };
 
-static void label(bNode *node, char *label, int maxlen)
+static void label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
 	if (node->custom1 == 0)
 		BLI_strncpy(label, IFACE_("Undistortion"), maxlen);
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index c5f98ea64bd..a3298de5d59 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -82,7 +82,7 @@ bNodeSocket *node_group_find_output_socket(bNode *groupnode, const char *identif
 }
 
 /* groups display their internal tree name as label */
-void node_group_label(bNode *node, char *label, int maxlen)
+void node_group_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
 	BLI_strncpy(label, (node->id) ? node->id->name + 2 : IFACE_("Missing Datablock"), maxlen);
 }
diff --git a/source/blender/nodes/intern/node_common.h b/source/blender/nodes/intern/node_common.h
index 8c7cefedee6..df3937f5a3e 100644
--- a/source/blender/nodes/intern/node_common.h
+++ b/source/blender/nodes/intern/node_common.h
@@ -37,7 +37,7 @@
 
 struct bNodeTree;
 
-void node_group_label(struct bNode *node, char *label, int maxlen);
+void node_group_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
 int node_group_poll_instance(struct bNode *node, struct bNodeTree *nodetree);
 
 void ntree_update_reroute_nodes(struct bNodeTree *ntree);
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c
index 0820c2acd50..3997d9cbcac 100644
--- a/source/blender/nodes/intern/node_util.c
+++ b/source/blender/nodes/intern/node_util.c
@@ -83,28 +83,28 @@ void *node_initexec_curves(bNodeExecContext *UNUSED(context), bNode *node, bNode
 
 /**** Labels ****/
 
-void node_blend_label(bNode *node, char *label, int maxlen)
+void node_blend_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
 	const char *name;
 	RNA_enum_name(ramp_blend_items, node->custom1, &name);
 	BLI_strncpy(label, IFACE_(name), maxlen);
 }
 
-void node_math_label(bNode *node, char *label, int maxlen)
+void node_math_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
 	const char *name;
 	RNA_enum_name(node_math_items, node->custom1, &name);
 	BLI_strncpy(label, IFACE_(name), maxlen);
 }
 
-void node_vect_math_label(bNode *node, char *label, int maxlen)
+void node_vect_math_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
 	const char *name;
 	RNA_enum_name(node_vec_math_items, node->custom1, &name);
 	BLI_strncpy(label, IFACE_(name), maxlen);
 }
 
-void node_filter_label(bNode *node, char *label, int maxlen)
+void node_filter_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
 	const char *name;
 	RNA_enum_name(node_filter_items, node->custom1, &name);
diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h
index 03a167cdb1a..64b2028874b 100644
--- a/source/blender/nodes/intern/node_util.h
+++ b/source/blender/nodes/intern/node_util.h
@@ -71,10 +71,10 @@ extern void *node_initexec_curves(struct bNodeExecContext *context, struct bNode
 
 /**** Labels ****/
 
-void node_blend_label(struct bNode *node, char *label, int maxlen);
-void node_math_label(struct bNode *node, char *label, int maxlen);
-void node_vect_math_label(struct bNode *node, char *label, int maxlen);
-void node_filter_label(struct bNode *node, char *label, int maxlen);
+void node_blend_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
+void node_math_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
+void node_vect_math_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
+void node_filter_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
 
 void node_update_internal_links_default(struct bNodeTree *ntree, struct bNode *node);