tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix #107545: Mistakes in recent node.cc cleanup 

1. Early return needs inverted null checking.
2. `BLO_expand` macros expect value, not a pointer.

Pull Request: https://projects.blender.org/blender/blender/pulls/107622
This commit is contained in:
illua1 2023-05-04 16:32:15 +02:00 committed by Hans Goudey
parent 42d3df25f3
commit 239c1194a0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/node.cc
View File

@ -974,29 +974,29 @@ static void expand_node_socket(BlendExpander *expander, bNodeSocket *sock)
{
IDP_BlendReadExpand(expander, sock->prop);
if (sock->default_value != nullptr) {
if (sock->default_value == nullptr) {
return;
}
switch (eNodeSocketDatatype(sock->type)) {
case SOCK_OBJECT: {
BLO_expand(expander, &sock->default_value_typed<bNodeSocketValueObject>()->value);
BLO_expand(expander, sock->default_value_typed<bNodeSocketValueObject>()->value);
break;
}
case SOCK_IMAGE: {
BLO_expand(expander, &sock->default_value_typed<bNodeSocketValueImage>()->value);
BLO_expand(expander, sock->default_value_typed<bNodeSocketValueImage>()->value);
break;
}
case SOCK_COLLECTION: {
BLO_expand(expander, &sock->default_value_typed<bNodeSocketValueCollection>()->value);
BLO_expand(expander, sock->default_value_typed<bNodeSocketValueCollection>()->value);
break;
}
case SOCK_TEXTURE: {
BLO_expand(expander, &sock->default_value_typed<bNodeSocketValueTexture>()->value);
BLO_expand(expander, sock->default_value_typed<bNodeSocketValueTexture>()->value);
break;
}
case SOCK_MATERIAL: {
BLO_expand(expander, &sock->default_value_typed<bNodeSocketValueMaterial>()->value);
BLO_expand(expander, sock->default_value_typed<bNodeSocketValueMaterial>()->value);
break;
}
case SOCK_FLOAT: