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

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-02-15 11:03:45 +11:00
parent bdd40f167e 85b93772db
commit 3dde1e9df7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
View File

@@ -145,8 +145,8 @@ static void node_copy_storage(bNodeTree * /*dst_tree*/, bNode *dst_node, const b
static void node_gather_link_searches(GatherLinkSearchOpParams &params)
{
const eNodeSocketDatatype data_type = eNodeSocketDatatype(params.other_socket().type);
if (params.in_out() == SOCK_IN) {
const eNodeSocketDatatype data_type = eNodeSocketDatatype(params.other_socket().type);
if (data_type == SOCK_MENU) {
params.add_item(IFACE_("Menu"), [](LinkSearchOpParams &params) {
bNode &node = params.add_node("GeometryNodeMenuSwitch");
@@ -155,11 +155,13 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
}
}
else {
params.add_item(IFACE_("Output"), [](LinkSearchOpParams &params) {
bNode &node = params.add_node("GeometryNodeMenuSwitch");
node_storage(node).data_type = params.socket.type;
params.update_and_connect_available_socket(node, "Output");
});
if (data_type != SOCK_MENU) {
params.add_item(IFACE_("Output"), [](LinkSearchOpParams &params) {
bNode &node = params.add_node("GeometryNodeMenuSwitch");
node_storage(node).data_type = params.socket.type;
params.update_and_connect_available_socket(node, "Output");
});
}
}
}