[Bf-blender-cvs] [e761d0bdc93] master: Fix T78080: group node has incorrect sockets after changing group

[Jacques Lucke]

Commit: e761d0bdc93007d3fadf14fc42eff3a71ad5ee26
Author: Jacques Lucke
Date:   Wed Jun 24 16:53:46 2020 +0200
Branches: master
https://developer.blender.org/rBe761d0bdc93007d3fadf14fc42eff3a71ad5ee26

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

===================================================================

M	source/blender/nodes/intern/node_common.c

===================================================================

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;
     }
   }