Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-02-11 13:50:12 +0300
committerJacques Lucke <jacques@blender.org>2021-02-11 13:50:12 +0300
commit69e191604b55b5c64acfb3d29253aca33fb023bb (patch)
tree86ae22d27e6edf6f3a28fb2e2f7605c4cef6230b /source/blender/editors/space_node/node_relationships.c
parent8f707a72e81833bb835324ddc635b29dfbe87a9f (diff)
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.
Diffstat (limited to 'source/blender/editors/space_node/node_relationships.c')
-rw-r--r--source/blender/editors/space_node/node_relationships.c4
1 files changed, 2 insertions, 2 deletions
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--;