blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Nodes: Move data-block default values with link drag search #105972

Merged
Hans Goudey merged 17 commits from mod_moder/blender:move_value_by_link into main 2023-04-03 19:33:49 +02:00
Conversation 4 Commits 17 Files Changed 4 +35 -15
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df74307ee0 - Show all commits

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

@ -2355,23 +2355,36 @@ bNode *node_copy_with_mapping(bNodeTree *dst_tree,
return node_dst;
}
static void for_each_geo_socket_instance(Main &bmain,
const bNodeTree &node_group,
const StringRef socket_identifier,
const FunctionRef<void(bNodeSocket &)> func)
static bNodeTree *node_find_tree_by_name(Main &bmain, const StringRef tree_name)
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2023-03-25 16:49:30 +01:00
Outdated
Review
Copy Link

A clearer interface for this function might be:

void node_socket_default_value(Main &bmain, bNodeTree &tree, bNodeSocket &src, bNodeSocket &dst)

That would allow moving in either direction, and clarify the source/destination from the link's from/to naming.

A clearer interface for this function might be: ``` void node_socket_default_value(Main &bmain, bNodeTree &tree, bNodeSocket &src, bNodeSocket &dst) ``` That would allow moving in either direction, and clarify the source/destination from the link's from/to naming.
Iliya Katushenock commented 2023-03-25 17:04:45 +01:00
Outdated
Review
Copy Link

Here the problem is that we must update the topology cache in advance in order to have access to the parent nodes of sockets from the function.

Here the problem is that we must update the topology cache in advance in order to have access to the parent nodes of sockets from the function.
Hans Goudey commented 2023-03-25 17:12:59 +01:00
Outdated
Review
Copy Link

Yeah, I think that's okay, it can be documented in the function's doc-string or the function can just ensure the topology cache itself.

Yeah, I think that's okay, it can be documented in the function's doc-string or the function can just ensure the topology cache itself.
{
LISTBASE_FOREACH (bNodeTree *, other_tree, &bmain.nodetrees) {
if (other_tree->type != NTREE_GEOMETRY) {
LISTBASE_FOREACH (bNodeTree *, node_tree, &bmain.nodetrees) {
if (node_tree->id.name == tree_name) {
return node_tree;
}
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2023-04-03 16:13:49 +02:00
Outdated
Review
Copy Link

I think it's clearer to pass the node group as const bNodeTree &group and let this function handle the ID * comparison with something like &group.id.

I think it's clearer to pass the node group as `const bNodeTree &group` and let this function handle the `ID *` comparison with something like `&group.id`.
}
return nullptr;
}
static void for_each_group_socket_instance(Main &bmain,
const StringRef group_identifier,
const StringRef socket_identifier,
const Span<int> tree_types_to_lookup,
const FunctionRef<void(bNodeSocket &)> func)
{
const bNodeTree *target_tree = node_find_tree_by_name(bmain, group_identifier);
LISTBASE_FOREACH (bNodeTree *, other_group, &bmain.nodetrees) {
if (!tree_types_to_lookup.contains(other_group->type)) {
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2023-03-25 16:49:49 +01:00
Outdated
Review
Copy Link

This doesn't seem necessary, there's no recursion in this function.

This doesn't seem necessary, there's no recursion in this function.
continue;
}
/* Avoid iteration on self tree nodes. */
if (other_tree == &node_group) {
if (other_group == target_tree) {
continue;
}
other_tree->ensure_topology_cache();
for (bNode *node : other_tree->group_nodes()) {
if (reinterpret_cast<bNodeTree *>(node->id) != &node_group) {
other_group->ensure_topology_cache();
const ID *group_tree_id = reinterpret_cast<const ID *>(target_tree);
for (bNode *node : other_group->group_nodes()) {
if (node->id != group_tree_id) {
continue;
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2023-03-25 16:51:21 +01:00
Outdated
Review
Copy Link

It might be preferable to just use ID * rather than Image * here, since this logic could apply to all data-block socket types in the future, and no specific data from Image needs to be used.

It might be preferable to just use `ID *` rather than `Image *` here, since this logic could apply to all data-block socket types in the future, and no specific data from `Image` needs to be used.
}
bNodeSocket &group_input_socket = node->input_by_identifier(socket_identifier);
@ -2417,10 +2430,17 @@ void node_socket_default_value(Main &bmain, bNodeTree &tree, bNodeSocket &src, b
}
case NODE_GROUP_INPUT: {
const StringRef socket_identifier(dst.identifier);
for_each_geo_socket_instance(bmain, tree, socket_identifier, [&](bNodeSocket &socket) {
Image **tmp_dst_value = &socket.default_value_typed<bNodeSocketValueImage>()->value;
dst_values.append(reinterpret_cast<ID **>(tmp_dst_value));
});
const StringRef group_identifier(tree.id.name);
for_each_group_socket_instance(
bmain,
group_identifier,
socket_identifier,
{NTREE_GEOMETRY},
[&](bNodeSocket &socket) {
Image **tmp_dst_value =
&socket.default_value_typed<bNodeSocketValueImage>()->value;
dst_values.append(reinterpret_cast<ID **>(tmp_dst_value));
});
break;
}
default: {