[Bf-blender-cvs] [399fc4af2ae] temp-nodes-group-declarations: Merge branch 'master' into temp-nodes-group-declarations

[Hans Goudey]

Commit: 399fc4af2ae47cce998ce7f2f4d8bb66a2ca5b99
Author: Hans Goudey
Date:   Thu Dec 29 14:12:26 2022 -0500
Branches: temp-nodes-group-declarations
https://developer.blender.org/rB399fc4af2ae47cce998ce7f2f4d8bb66a2ca5b99

Merge branch 'master' into temp-nodes-group-declarations

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



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

diff --cc source/blender/editors/space_node/node_relationships.cc
index 53543fc9e3b,ca9ee0c245e..e7c05ed5f37
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@@ -909,18 -908,12 +908,16 @@@ static void add_dragged_links_to_tree(b
      /* before actually adding the link,
       * let nodes perform special link insertion handling
       */
-     if (link->fromnode->typeinfo->insert_link) {
-       if (!link->fromnode->typeinfo->insert_link(&ntree, link->fromnode, link)) {
-         MEM_freeN(link);
+     bNodeLink *new_link = MEM_new<bNodeLink>(__func__, link);
+     if (link.fromnode->typeinfo->insert_link) {
 -      link.fromnode->typeinfo->insert_link(&ntree, link.fromnode, new_link);
++      if (!link.fromnode->typeinfo->insert_link(&ntree, link.fromnode, new_link)) {
 +        continue;
 +      }
      }
-     if (link->tonode->typeinfo->insert_link) {
-       if (!link->tonode->typeinfo->insert_link(&ntree, link->tonode, link)) {
-         MEM_freeN(link);
+     if (link.tonode->typeinfo->insert_link) {
 -      link.tonode->typeinfo->insert_link(&ntree, link.tonode, new_link);
++      if (!link.tonode->typeinfo->insert_link(&ntree, link.tonode, new_link)) {
 +        continue;
 +      }
      }
  
      /* add link to the node tree */