diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2018-01-08 00:29:25 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2018-01-08 00:29:25 +0300 |
| commit | 87607254d6d3f9ca5ebbc696a4066bf0c8fbbed4 (patch) | |
| tree | 0fd4aedc48f05c87e722250e2c00dca04cac1974 /source/blender/blenkernel/intern/node.c | |
| parent | add580beeea0e1d5bd8be2336c8a5b25bc8c601a (diff) | |
(Nodes) Display image name if any in the Image and Texture Image node title
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 2ca414c5e6e..6be6514b5ec 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3173,13 +3173,17 @@ void nodeSynchronizeID(bNode *node, bool copy_to_id) void nodeLabel(bNodeTree *ntree, bNode *node, char *label, int maxlen) { + label[0] = '\0'; + if (node->label[0] != '\0') { BLI_strncpy(label, node->label, maxlen); } else if (node->typeinfo->labelfunc) { node->typeinfo->labelfunc(ntree, node, label, maxlen); } - else { + + /* The previous methods (labelfunc) could not provide an adequate label for the node. */ + if (label[0] == '\0') { /* Kind of hacky and weak... Ideally would be better to use RNA here. :| */ const char *tmp = CTX_IFACE_(BLT_I18NCONTEXT_ID_NODETREE, node->typeinfo->ui_name); if (tmp == node->typeinfo->ui_name) { |