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>2022-02-09 14:38:08 +0300
committerJacques Lucke <jacques@blender.org>2022-02-09 14:38:08 +0300
commit3f061ef050ccb671f9c4c9b65a17f0d097e24344 (patch)
tree35b793c1ff3c2d2dad78c8eb58758a372e951e40 /source/blender/editors/space_node
parent312c8fdaf927421e697da0185360240bafd64a4b (diff)
parentd82384f7e1a0ae6fd3b27bb261a4cd671c9939ac (diff)
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r--source/blender/editors/space_node/node_relationships.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index 2a197e93f42..d92f86c2cfc 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -2453,12 +2453,12 @@ void ED_node_link_insert(Main *bmain, ScrArea *area)
bNodeSocket *best_output = get_main_socket(ntree, *node_to_insert, SOCK_OUT);
/* Ignore main sockets when the types don't match. */
- if (best_input != nullptr &&
+ if (best_input != nullptr && ntree.typeinfo->validate_link != nullptr &&
!ntree.typeinfo->validate_link(static_cast<eNodeSocketDatatype>(old_link->fromsock->type),
static_cast<eNodeSocketDatatype>(best_input->type))) {
best_input = nullptr;
}
- if (best_output != nullptr &&
+ if (best_output != nullptr && ntree.typeinfo->validate_link != nullptr &&
!ntree.typeinfo->validate_link(static_cast<eNodeSocketDatatype>(best_output->type),
static_cast<eNodeSocketDatatype>(old_link->tosock->type))) {
best_output = nullptr;