blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 771 Projects 19 Wiki Activity

Cleanup: Correcting default cases in node.cc #107339

Merged
Hans Goudey merged 10 commits from mod_moder/blender:tmp_cleanup_ensure_default_cases into main 2023-06-06 19:19:59 +02:00
Conversation 4 Commits 10 Files Changed 1 +15 -3
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9325857296 - Show all commits

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

@ -2456,7 +2456,7 @@ void node_socket_move_default_value(Main & /*bmain*/,
ID **src_socket_value = nullptr;
Vector<ID **> dst_values;
switch (dst.type) {
switch (eNodeSocketDatatype(dst.type)) {
case SOCK_IMAGE: {
Image **tmp_socket_value = &src.default_value_typed<bNodeSocketValueImage>()->value;
src_socket_value = reinterpret_cast<ID **>(tmp_socket_value);
@ -2475,12 +2475,24 @@ void node_socket_move_default_value(Main & /*bmain*/,
}
break;
}
case SOCK_BOOLEAN:
case SOCK_INT:
case SOCK_FLOAT:
case SOCK_VECTOR:
case SOCK_RGBA:
case SOCK_STRING:
case SOCK_OBJECT:
case SOCK_COLLECTION:
case SOCK_TEXTURE:
case SOCK_MATERIAL:
/* Unsupported yet. */
return;
case __SOCK_MESH:
case SOCK_CUSTOM:
case SOCK_SHADER:
case SOCK_GEOMETRY: {
case SOCK_GEOMETRY:
/* Unmovable types. */
return;
}
}
if (dst_values.is_empty() || src_socket_value == nullptr) {