[Bf-blender-cvs] [20b2d6fc718] master: Fix T103624: Last node is skipped for cursor and link picking

Hans Goudey noreply at git.blender.org
Wed Jan 4 16:07:03 CET 2023


Commit: 20b2d6fc71803a1b23604a42317fa173b71792e6
Author: Hans Goudey
Date:   Wed Jan 4 10:06:10 2023 -0500
Branches: master
https://developer.blender.org/rB20b2d6fc71803a1b23604a42317fa173b71792e6

Fix T103624: Last node is skipped for cursor and link picking

I wrote the reverse iteration incorrectly in e091291b5b5f525cd8d38898c.

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

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

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

diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 12a1fcdebd0..dfa74f37058 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -2601,7 +2601,7 @@ static const bNode *find_node_under_cursor(SpaceNode &snode, const float2 &curso
 {
   /* Check nodes front to back. */
   const Span<bNode *> nodes = snode.edittree->all_nodes();
-  for (int i = nodes.index_range().last(); i > 0; i--) {
+  for (int i = nodes.index_range().last(); i >= 0; i--) {
     if (BLI_rctf_isect_pt(&nodes[i]->runtime->totr, cursor[0], cursor[1])) {
       return nodes[i];
     }
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 7f6a04e4381..fb4173a9b6b 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -1130,7 +1130,7 @@ bNodeSocket *node_find_indicated_socket(SpaceNode &snode,
   snode.edittree->ensure_topology_cache();
 
   const Span<bNode *> nodes = snode.edittree->all_nodes();
-  for (int i = nodes.index_range().last(); i > 0; i--) {
+  for (int i = nodes.index_range().last(); i >= 0; i--) {
     bNode &node = *nodes[i];
 
     BLI_rctf_init_pt_radius(&rect, cursor, size_sock_padded);



More information about the Bf-blender-cvs mailing list