From e761d0bdc93007d3fadf14fc42eff3a71ad5ee26 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 24 Jun 2020 16:53:46 +0200 Subject: Fix T78080: group node has incorrect sockets after changing group It was only checking for the identifier, but the type has to be equivalent as well. Reviewers: mano-wii, brecht Differential Revision: https://developer.blender.org/D8101 --- source/blender/nodes/intern/node_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index 765fa84439f..996fb93eb76 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -125,7 +125,7 @@ static bNodeSocket *group_verify_socket( bNodeSocket *sock; for (sock = verify_lb->first; sock; sock = sock->next) { - if (STREQ(sock->identifier, iosock->identifier)) { + if (sock->typeinfo == iosock->typeinfo && STREQ(sock->identifier, iosock->identifier)) { break; } } -- cgit v1.2.3