diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 26 |
2 files changed, 2 insertions, 28 deletions
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 25c715e8ae7..7b9b324066a 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -1084,11 +1084,11 @@ class TOPBAR_PT_name(Panel): row.prop(item, "name", text="") found = True elif space_type == 'NODE_EDITOR': - layout.label(text="Node Label") + layout.label(text="Node Name") item = context.active_node if item: row = row_with_icon(layout, 'NODE') - row.prop(item, "label", text="") + row.prop(item, "name", text="") found = True else: if mode == 'POSE' or (mode == 'WEIGHT_PAINT' and context.pose_object): diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index c60aa494512..44cf15995f9 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1617,31 +1617,6 @@ static void rna_Node_name_set(PointerRNA *ptr, const char *value) BKE_animdata_fix_paths_rename_all(NULL, "nodes", oldname, node->name); } -static int rna_Node_label_length(PointerRNA *ptr) -{ - bNode *node = (bNode *)ptr->data; - - if (node->label[0] == '\0') { - return strlen(node->name); - } - else { - return strlen(node->label); - } - - return 0; -} - -static void rna_Node_label_get(PointerRNA *ptr, char *value) -{ - bNode *node = (bNode *)ptr->data; - if (node->label[0] == '\0') { - strcpy(value, node->name); - } - else { - strcpy(value, node->label); - } -} - static bNodeSocket *rna_Node_inputs_new(ID *id, bNode *node, Main *bmain, ReportList *reports, const char *type, const char *name, const char *identifier) { /* Adding an input to a group node is not working, simpler to add it to its underlying nodetree. */ @@ -8002,7 +7977,6 @@ static void rna_def_node(BlenderRNA *brna) prop = RNA_def_property(srna, "label", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "label"); - RNA_def_property_string_funcs(prop, "rna_Node_label_get", "rna_Node_label_length", NULL); RNA_def_property_ui_text(prop, "Label", "Optional custom node label"); RNA_def_property_update(prop, NC_NODE | ND_DISPLAY, NULL); |