Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support

1 files changed, 7 insertions, 1 deletions

diff --git a/source/blender/nodes/intern/node_declaration.cc b/source/blender/nodes/intern/node_declaration.cc
index e804d10ad75..75d47cfd386 100644
--- a/source/blender/nodes/intern/node_declaration.cc
+++ b/source/blender/nodes/intern/node_declaration.cc
@@ -51,11 +51,14 @@ bNodeSocket &SocketDeclaration::update_or_build(bNodeTree &ntree,
                                                 bNodeSocket &socket) const
 {
   /* By default just rebuild. */
-  return this->build(ntree, node, (eNodeSocketInOut)socket.in_out);
+  BLI_assert(socket.in_out == in_out_);
+  UNUSED_VARS_NDEBUG(socket);
+  return this->build(ntree, node);
 }
 
 void SocketDeclaration::set_common_flags(bNodeSocket &socket) const
 {
+  SET_FLAG_FROM_TEST(socket.flag, compact_, SOCK_COMPACT);
   SET_FLAG_FROM_TEST(socket.flag, hide_value_, SOCK_HIDE_VALUE);
   SET_FLAG_FROM_TEST(socket.flag, hide_label_, SOCK_HIDE_LABEL);
   SET_FLAG_FROM_TEST(socket.flag, is_multi_input_, SOCK_MULTI_INPUT);
@@ -70,6 +73,9 @@ bool SocketDeclaration::matches_common_data(const bNodeSocket &socket) const
   if (socket.identifier != identifier_) {
     return false;
   }
+  if (((socket.flag & SOCK_COMPACT) != 0) != compact_) {
+    return false;
+  }
   if (((socket.flag & SOCK_HIDE_VALUE) != 0) != hide_value_) {
     return false;
   }