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

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Hans Goudey
2025-10-12 10:37:21 -04:00
parent a9d330fe25 ef58bd609b
commit 241849e397
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3752,6 +3752,17 @@ void node_socket_move_default_value(Main & /*bmain*/,
}
}
/* Special handling for strings because the generic code below can't handle them. */
if (src.type == SOCK_STRING && dst.type == SOCK_STRING &&
dst_node.is_type("FunctionNodeInputString"))
{
auto *src_value = static_cast<bNodeSocketValueString *>(src.default_value);
auto *dst_storage = static_cast<NodeInputString *>(dst_node.storage);
MEM_SAFE_FREE(dst_storage->string);
dst_storage->string = BLI_strdup_null(src_value->value);
return;
}
void *src_value = socket_value_storage(src);
if (!src_value) {
return;
@@ -3768,17 +3779,6 @@ void node_socket_move_default_value(Main & /*bmain*/,
return;
}
/* Special handling for strings because the generic code below can't handle them. */
if (src.type == SOCK_STRING && dst.type == SOCK_STRING &&
dst_node.is_type("FunctionNodeInputString"))
{
auto *src_value = static_cast<bNodeSocketValueString *>(src.default_value);
auto *dst_storage = static_cast<NodeInputString *>(dst_node.storage);
MEM_SAFE_FREE(dst_storage->string);
dst_storage->string = BLI_strdup_null(src_value->value);
return;
}
void *dst_value = node_static_value_storage_for(dst_node, dst);
if (!dst_value) {
return;