[Bf-blender-cvs] [68487cff95b] blender-v3.3-release: Fix T98968: Node reroute tool doesn't add to frames

Pratik Borhade noreply at git.blender.org
Mon Aug 29 21:45:15 CEST 2022


Commit: 68487cff95b335491e001ded8620b4b7aa3380db
Author: Pratik Borhade
Date:   Mon Aug 29 14:39:14 2022 -0500
Branches: blender-v3.3-release
https://developer.blender.org/rB68487cff95b335491e001ded8620b4b7aa3380db

Fix T98968: Node reroute tool doesn't add to frames

If reroute node lies in side the frame node boundaries then set
frame node as the parent of reroute.

Differential Revision: https://developer.blender.org/D15739

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

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

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

diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index a89b5444a4d..e96efb888f3 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -192,6 +192,13 @@ static bNodeSocketLink *add_reroute_do_socket_section(bContext *C,
 
     reroute_node->locx = insert_point[0] / UI_DPI_FAC;
     reroute_node->locy = insert_point[1] / UI_DPI_FAC;
+
+    LISTBASE_FOREACH_BACKWARD (bNode *, frame_node, &ntree->nodes) {
+      if (frame_node->type == NODE_FRAME && BLI_rctf_isect_pt_v(&frame_node->totr, insert_point)) {
+        nodeAttachNode(reroute_node, frame_node);
+        break;
+      }
+    }
   }
 
   return socklink;



More information about the Bf-blender-cvs mailing list