diff options
| author | Joshua Leung <aligorith@gmail.com> | 2018-03-20 06:13:37 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2018-03-20 06:13:37 +0300 |
| commit | c8a7c4f245391717f10ed4d67e38d955b64a6f44 (patch) | |
| tree | 4e64328a93ee3797fed5e3e34031a0be3885a22e /source/blender/nodes/intern | |
| parent | 84536d1d3ce217a44877acdc9845254249c040ce (diff) | |
| parent | 8e5c407fc446b35042c626e7d60ff9a2336093f4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes/intern')
| -rw-r--r-- | source/blender/nodes/intern/node_util.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c index 43d4136d556..9f04c12fb5e 100644 --- a/source/blender/nodes/intern/node_util.c +++ b/source/blender/nodes/intern/node_util.c @@ -124,6 +124,11 @@ void node_filter_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int m /* test if two sockets are interchangeable */ static bool node_link_socket_match(bNodeSocket *a, bNodeSocket *b) { + /* check if sockets are of the same type */ + if (a->typeinfo != b->typeinfo) { + return false; + } + /* tests if alphabetic prefix matches * this allows for imperfect matches, such as numeric suffixes, * like Color1/Color2 |