griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #110210: Hide Value option doesn't work on color sockets

Browse Source 
Regression caused by 7026096099.
Original error introduced in 46fff97604.
Name hadling isn't problem of a declaration matching functions.

Pull Request: https://projects.blender.org/blender/blender/pulls/110225
This commit is contained in:
Iliya Katueshenock
2023-07-27 14:55:15 +02:00
committed by Hans Goudey
parent 6b9da41221
commit 6a03f3a575
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/nodes/intern/node_socket_declarations.cc
View File

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