[Bf-blender-cvs] [09710d5f2ae] master: Geometry Nodes: show timing overlay above attributes overlay

[Jacques Lucke]

Commit: 09710d5f2ae5dd238c12d70f010a56e1f1dd7321
Author: Jacques Lucke
Date:   Mon Apr 25 16:03:34 2022 +0200
Branches: master
https://developer.blender.org/rB09710d5f2ae5dd238c12d70f010a56e1f1dd7321

Geometry Nodes: show timing overlay above attributes overlay

===================================================================

M	source/blender/editors/space_node/node_draw.cc

===================================================================

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;
 }