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:
authorJacques Lucke <jacques@blender.org>2022-04-25 17:03:34 +0300
committerJacques Lucke <jacques@blender.org>2022-04-25 17:03:34 +0300
commit09710d5f2ae5dd238c12d70f010a56e1f1dd7321 (patch)
tree817eb06b4bcc7f38fb5116d62b0ac93f7020c6a0 /source/blender/editors/space_node
parent26afa23b3b81234e60a57c28ed447e5fb920e4b3 (diff)
Geometry Nodes: show timing overlay above attributes overlay
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r--source/blender/editors/space_node/node_draw.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 90ab798bafc..8ee39864c63 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -1824,6 +1824,13 @@ static Vector<NodeExtraInfoRow> node_get_extra_info(const SpaceNode &snode, cons
return rows;
}
+ if (snode.overlay.flag & SN_OVERLAY_SHOW_NAMED_ATTRIBUTES &&
+ snode.edittree->type == NTREE_GEOMETRY) {
+ if (std::optional<NodeExtraInfoRow> row = node_get_accessed_attributes_row(snode, node)) {
+ rows.append(std::move(*row));
+ }
+ }
+
if (snode.overlay.flag & SN_OVERLAY_SHOW_TIMINGS && snode.edittree->type == NTREE_GEOMETRY &&
(ELEM(node.typeinfo->nclass, NODE_CLASS_GEOMETRY, NODE_CLASS_GROUP, NODE_CLASS_ATTRIBUTE) ||
ELEM(node.type, NODE_FRAME, NODE_GROUP_OUTPUT))) {
@@ -1848,13 +1855,6 @@ static Vector<NodeExtraInfoRow> node_get_extra_info(const SpaceNode &snode, cons
}
}
- if (snode.overlay.flag & SN_OVERLAY_SHOW_NAMED_ATTRIBUTES &&
- snode.edittree->type == NTREE_GEOMETRY) {
- if (std::optional<NodeExtraInfoRow> row = node_get_accessed_attributes_row(snode, node)) {
- rows.append(std::move(*row));
- }
- }
-
return rows;
}