[Bf-blender-cvs] [69e191604b5] master: Fix T85541: crash when replacing an existing node link

[Jacques Lucke]

Commit: 69e191604b55b5c64acfb3d29253aca33fb023bb
Author: Jacques Lucke
Date:   Thu Feb 11 11:50:12 2021 +0100
Branches: master
https://developer.blender.org/rB69e191604b55b5c64acfb3d29253aca33fb023bb

Fix T85541: crash when replacing an existing node link

It's not necessary to check if the link has to be removed,
if it was removed already.

This regression was caused by rB8f707a72e81833bb835324ddc635b29dfbe87a9f.

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

M	source/blender/editors/space_node/node_relationships.c

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

diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index 93accad319f..d6edfcce8e8 100644
--- a/source/blender/editors/space_node/node_relationships.c
+++ b/source/blender/editors/space_node/node_relationships.c
@@ -732,8 +732,8 @@ static void node_remove_extra_links(SpaceNode *snode, bNodeLink *link)
         tlink = NULL;
         to_count--;
       }
-      /* Also remove link if it comes from the same output. */
-      if (tlink->fromsock == from) {
+      else if (tlink->fromsock == from) {
+        /* Also remove link if it comes from the same output. */
         nodeRemLink(ntree, tlink);
         tlink = NULL;
         to_count--;