Commit: d82384f7e1a0ae6fd3b27bb261a4cd671c9939ac
Author: Jacques Lucke
Date: Wed Feb 9 12:36:20 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBd82384f7e1a0ae6fd3b27bb261a4cd671c9939ac
Fix T95640: missing null check in previous commit
===================================================================
M source/blender/editors/space_node/node_relationships.cc
===================================================================
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
