Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4fd2d10c1 - Show all commits

5
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
View File

@ -1499,6 +1499,8 @@ struct GeometryNodesLazyFunctionGraphBuilder {
multi_input_socket_nodes_.add_new(&bsocket, &lf_multi_input_node); multi_input_socket_nodes_.add_new(&bsocket, &lf_multi_input_node);
for (lf::InputSocket *lf_multi_input_socket : lf_multi_input_node.inputs()) { for (lf::InputSocket *lf_multi_input_socket : lf_multi_input_node.inputs()) {
mapping_->bsockets_by_lf_socket_map.add(lf_multi_input_socket, &bsocket); mapping_->bsockets_by_lf_socket_map.add(lf_multi_input_socket, &bsocket);
const void *default_value = lf_multi_input_socket->type().default_value();
lf_multi_input_socket->set_default_value(default_value);
} }
} }
else { else {
@ -2740,7 +2742,8 @@ class UsedSocketVisualizeOptions : public lf::Graph::ToDotOptions {
socket_name_suffixes_.add(lf_socket, suffix); socket_name_suffixes_.add(lf_socket, suffix);
} }
} }
else if (lf::OutputSocket *lf_socket = builder_.output_socket_map_.lookup(bsocket)) { else if (lf::OutputSocket *lf_socket = builder_.output_socket_map_.lookup_default(bsocket,
nullptr)) {
socket_font_colors_.add(lf_socket, color_str); socket_font_colors_.add(lf_socket, color_str);
socket_name_suffixes_.add(lf_socket, suffix); socket_name_suffixes_.add(lf_socket, suffix);
} }