Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2016-08-30 12:32:31 +0300
committerAlexander Gavrilov <angavrilov@gmail.com>2016-08-30 12:32:31 +0300
commit3a0c0c1b5425cd5b050cb742357da57266c70463 (patch)
treec9fc9362ea75543cd0b1adbdbaf84b965563ac1e
parent47b87e1f3b5d52799024f5529b946837f390448e (diff)
Fix node editor to display node group names in the bottom left corner.
Currently it pointlessly repeats the material name there, separated by slashes. That obviously should display the nested group path instead.
-rw-r--r--source/blender/editors/space_node/node_draw.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index d9c51e427c8..ab40c55b59d 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1327,8 +1327,10 @@ void drawnodespace(const bContext *C, ARegion *ar)
path = snode->treepath.last;
/* update tree path name (drawn in the bottom left) */
- if (snode->id && UNLIKELY(!STREQ(path->node_name, snode->id->name + 2))) {
- BLI_strncpy(path->node_name, snode->id->name + 2, sizeof(path->node_name));
+ ID *name_id = (path->nodetree && path->nodetree != snode->nodetree) ? &path->nodetree->id : snode->id;
+
+ if (name_id && UNLIKELY(!STREQ(path->node_name, name_id->name + 2))) {
+ BLI_strncpy(path->node_name, name_id->name + 2, sizeof(path->node_name));
}
/* current View2D center, will be set temporarily for parent node trees */