blender/blender
148
474
Fork 697
Code Issues 6.7k Pull Requests 881 Projects 18 Wiki Activity

Geometry Nodes: Link drag search value moving improvement #107470

Merged
Hans Goudey merged 7 commits from mod_moder/blender:tmp_add_other_value_option_to_dnd_moving into main 2023-05-02 18:50:42 +02:00
Conversation 6 Commits 7 Files Changed 1 +33 -24
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 486d200783 - Show all commits

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

@ -2426,6 +2426,27 @@ bNode *node_copy_with_mapping(bNodeTree *dst_tree,
return node_dst;
}
/**
* Type of value storage related with socket is the same.
* \param socket: Node can have multiple sockets & storages pairs.
*/
void **node_static_value_storage_for(bNode &node, const bNodeSocket &socket)
{
if (!socket.is_output()) {
return nullptr;
}
switch (node.type) {
case GEO_NODE_IMAGE: {
return reinterpret_cast<void **>(&node.id);
}
default:
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2023-05-01 14:57:58 +02:00
Outdated
Review
Copy Link

IMO the brackets don't really help here, they just make the function take more space. They aren't necessary since you aren't declaring any variables in the cases. Same with below.

IMO the brackets don't really help here, they just make the function take more space. They aren't necessary since you aren't declaring any variables in the cases. Same with below.
break;
}
return nullptr;
}
void node_socket_move_default_value(Main & /*bmain*/,
bNodeTree &tree,
bNodeSocket &src,
@ -2449,25 +2470,16 @@ void node_socket_move_default_value(Main & /*bmain*/,
return;
}
ID **src_socket_value = nullptr;
Vector<ID **> dst_values;
void **src_socket_value = nullptr;
void **dst_value = node_static_value_storage_for(dst_node, dst);
if (dst_value == nullptr) {
return;
}
switch (dst.type) {
case SOCK_IMAGE: {
Image **tmp_socket_value = &src.default_value_typed<bNodeSocketValueImage>()->value;
src_socket_value = reinterpret_cast<ID **>(tmp_socket_value);
if (*src_socket_value == nullptr) {
break;
}
switch (dst_node.type) {
case GEO_NODE_IMAGE: {
dst_values.append(&dst_node.id);
break;
}
default: {
break;
}
}
src_socket_value = reinterpret_cast<void **>(tmp_socket_value);
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2023-05-01 22:19:34 +02:00
Outdated
Review
Copy Link

Seems simpler to return null here as a way to not support strings, rather than checking again below:

    case SOCK_STRING:
      /* Strings are not supported here. */
      return nullptr;
Seems simpler to return null here as a way to not support strings, rather than checking again below: ``` case SOCK_STRING: /* Strings are not supported here. */ return nullptr; ```
break;
}
case SOCK_CUSTOM:
@ -2481,17 +2493,14 @@ void node_socket_move_default_value(Main & /*bmain*/,
}
}
if (dst_values.is_empty() || src_socket_value == nullptr) {
if (src_socket_value == nullptr) {
return;
}
for (ID **dst_value : dst_values) {
*dst_value = *src_socket_value;
id_us_plus(*dst_value);
}
id_us_min(*src_socket_value);
*src_socket_value = nullptr;
ID **src_id = reinterpret_cast<ID **>(src_socket_value);
ID **dst_id = reinterpret_cast<ID **>(dst_value);
*dst_id = *src_id;
*src_id = nullptr;
}
bNode *node_copy(bNodeTree *dst_tree, const bNode &src_node, const int flag, const bool use_unique)