mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-04 13:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix types of inputs to nodes with a nested network implementation (#1978)

Browse source 
Fix types into nested networks
This commit is contained in:
James Lindsay 2024-09-15 23:49:43 +01:00 • committed by GitHub
parent dd4a97b09f
commit ef007736f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
editor/src/messages/portfolio/document/utility_types/network_interface.rs
View file

@ -489,11 +489,11 @@ impl NodeNetworkInterface {
if let Some(value) = node.inputs.get(input_index).and_then(|input| input.as_value()) {
return Some((value.ty(), TypeSource::TaggedValue));
}
let node_id_path = [network_path, &[node_id]].concat().clone();
let node_id_path = [network_path, &[node_id]].concat();
match &node.implementation {
DocumentNodeImplementation::Network(_nested_network) => {
// Attempt to resolve where this import is within the nested network (it may be connected to the node or directly to an export)
let outwards_wires = self.outward_wires(network_path);
let outwards_wires = self.outward_wires(&node_id_path);
let inputs_using_import = outwards_wires.and_then(|outwards_wires| outwards_wires.get(&OutputConnector::Import(input_index)));
let first_input = inputs_using_import.and_then(|input| input.first()).copied();
@ -542,6 +542,7 @@ impl NodeNetworkInterface {
return (concrete!(()), TypeSource::Error("node id not in network"));
};
let node_id_path = [network_path.as_slice(), &[node_id]].concat();
match &node.implementation {
DocumentNodeImplementation::ProtoNode(protonode) => {
let Some(node_types) = random_protonode_implementation(protonode) else {
@ -559,7 +560,7 @@ impl NodeNetworkInterface {
}
DocumentNodeImplementation::Network(_network) => {
// Attempt to resolve where this import is within the nested network
let outwards_wires = self.outward_wires(network_path);
let outwards_wires = self.outward_wires(&node_id_path);
let inputs_using_import = outwards_wires.and_then(|outwards_wires| outwards_wires.get(&OutputConnector::Import(input_index)));
let first_input = inputs_using_import.and_then(|input| input.first()).copied();