From 6a03f3a575da292cdca22e3563d373e6a0a670f7 Mon Sep 17 00:00:00 2001 From: Iliya Katueshenock Date: Thu, 27 Jul 2023 14:55:15 +0200 Subject: [PATCH] Fix #110210: Hide Value option doesn't work on color sockets Regression caused by 70260960994d6cce3a33dfc16b4911a6cab9d4f2. Original error introduced in 46fff97604ae167473ecd4c0cd9108dc20ba22e3. Name hadling isn't problem of a declaration matching functions. Pull Request: https://projects.blender.org/blender/blender/pulls/110225 --- .../nodes/intern/node_socket_declarations.cc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/source/blender/nodes/intern/node_socket_declarations.cc b/source/blender/nodes/intern/node_socket_declarations.cc index 458d2c344c3..dfdc129c093 100644 --- a/source/blender/nodes/intern/node_socket_declarations.cc +++ b/source/blender/nodes/intern/node_socket_declarations.cc @@ -347,12 +347,7 @@ bNodeSocket &Color::build(bNodeTree &ntree, bNode &node) const bool Color::matches(const bNodeSocket &socket) const { if (!this->matches_common_data(socket)) { - if (socket.name != this->name) { - return false; - } - if (socket.identifier != this->identifier) { - return false; - } + return false; } if (socket.type != SOCK_RGBA) { return false; @@ -401,12 +396,7 @@ bNodeSocket &Rotation::build(bNodeTree &ntree, bNode &node) const bool Rotation::matches(const bNodeSocket &socket) const { if (!this->matches_common_data(socket)) { - if (socket.name != this->name) { - return false; - } - if (socket.identifier != this->identifier) { - return false; - } + return false; } if (socket.type != SOCK_ROTATION) { return false;