mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-07-07 15:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 2013fdf70b into 24c6281644

Browse source
This commit is contained in:
James Lindsay 2025-07-07 10:21:48 +02:00 • committed by GitHub
commit 47323b509c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs
View file

@ -2132,19 +2132,12 @@ impl NodeGraphMessageHandler {
let node_properties = context
.network_interface
.upstream_flow_back_from_nodes(vec![layer], context.selection_network_path, network_interface::FlowType::HorizontalFlow)
.enumerate()
.take_while(|(i, node_id)| {
if *i == 0 {
true
} else {
!context.network_interface.is_layer(node_id, context.selection_network_path)
}
})
.map(|(_, node_id)| node_id)
.collect::<Vec<_>>()
.skip(1) // Skip the actual merge node
.take_while(|node_id| !context.network_interface.is_layer(node_id, context.selection_network_path)) // Go until another layer is reached
.collect::<Vec<_>>() // Required to avoid borrowing context twice (for some reason generating a property requires &mut access?)
.into_iter()
.map(|node_id| node_properties::generate_node_properties(node_id, context))
.collect::<Vec<_>>();
.rev() // Go from first node in the chain
.map(|node_id| node_properties::generate_node_properties(node_id, context));
layer_properties.extend(node_properties);
layer_properties