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
path: root/source
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-06-24 17:53:46 +0300
committerJacques Lucke <jacques@blender.org>2020-06-24 17:53:46 +0300
commite761d0bdc93007d3fadf14fc42eff3a71ad5ee26 (patch)
tree294b0f88b61d4b89b8c6792a3bb58edfba53674b /source
parentff0df7c546d7bedf092e7f150f6c4ce6a02978c1 (diff)
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
Diffstat (limited to 'source')
-rw-r--r--source/blender/nodes/intern/node_common.c2
1 files changed, 1 insertions, 1 deletions
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;
}
}