Update the order of the inputs to Blend Shapes for consistency with Morph

Author: Keavon

editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

@@ -188,9 +188,9 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 				network_interface.move_layer_to_stack(layer, parent, insert_index, &[]);
 				network_interface.move_layer_to_stack(blend_path_layer, parent, insert_index + 1, &[]);
 
-				// Connect the Path node's output to the Blend Shapes node's Path parameter input (input 2).
+				// Connect the Path node's output to the Blend Shapes node's Path parameter input (input 4).
 				// Done after move_layer_to_stack so chain nodes have correct positions when converted to absolute.
-				network_interface.set_input(&InputConnector::node(blend_shapes_node_id, 2), NodeInput::node(path_node_id, 0), &[]);
+				network_interface.set_input(&InputConnector::node(blend_shapes_node_id, 4), NodeInput::node(path_node_id, 0), &[]);
 
 				responses.add(NodeGraphMessage::SetDisplayNameImpl {
 					node_id: id,

editor/src/messages/portfolio/document/graph_operation/utility_types.rs

@@ -159,8 +159,6 @@ impl<'a> ModifyInputsContext<'a> {
 	pub fn insert_blend_shapes_data(&mut self, layer: LayerNodeIdentifier, count: f64) -> NodeId {
 		let blend_shapes = resolve_network_node_type("Blend Shapes").expect("Blend Shapes node does not exist").node_template_input_override([
 			Some(NodeInput::value(TaggedValue::Graphic(Default::default()), true)),
-			None,
-			None,
 			Some(NodeInput::value(TaggedValue::F64(count), false)),
 		]);
 

editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs

@@ -472,7 +472,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 							// 0: Separate Subpaths (split path into individual subpaths)
 							DocumentNode {
 								implementation: DocumentNodeImplementation::ProtoNode(vector::separate_subpaths::IDENTIFIER),
-								inputs: vec![NodeInput::import(generic!(T), 2)],
+								inputs: vec![NodeInput::import(generic!(T), 4)],
 								..Default::default()
 							},
 							// 1: Count Elements (number of subpaths)
@@ -490,7 +490,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 							// 3: Floor (integer count per subpath)
 							DocumentNode {
 								implementation: DocumentNodeImplementation::ProtoNode(math_nodes::floor::IDENTIFIER),
-								inputs: vec![NodeInput::import(concrete!(f64), 3)],
+								inputs: vec![NodeInput::import(concrete!(f64), 1)],
 								..Default::default()
 							},
 							// 4: Multiply (total_instances = count × subpath_count)
@@ -532,7 +532,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 							// 10: Path Is Closed (check if current subpath is closed)
 							DocumentNode {
 								implementation: DocumentNodeImplementation::ProtoNode(vector::path_is_closed::IDENTIFIER),
-								inputs: vec![NodeInput::import(generic!(T), 2), NodeInput::node(NodeId(8), 0)],
+								inputs: vec![NodeInput::import(generic!(T), 4), NodeInput::node(NodeId(8), 0)],
 								..Default::default()
 							},
 							// 11: Switch (closed → count, open → count - 1 as denominator)
@@ -566,15 +566,15 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 									NodeInput::import(generic!(T), 0),
 									NodeInput::node(NodeId(14), 0),
 									NodeInput::value(TaggedValue::Bool(false), false),
-									NodeInput::import(concrete!(vector::misc::InterpolationDistribution), 1),
-									NodeInput::import(generic!(T), 2),
+									NodeInput::import(concrete!(vector::misc::InterpolationDistribution), 3),
+									NodeInput::import(generic!(T), 4),
 								],
 								..Default::default()
 							},
 							// 16: Repeat
 							DocumentNode {
 								implementation: DocumentNodeImplementation::ProtoNode(repeat_nodes::repeat::IDENTIFIER),
-								inputs: vec![NodeInput::node(NodeId(15), 0), NodeInput::node(NodeId(4), 0), NodeInput::import(generic!(T), 4)],
+								inputs: vec![NodeInput::node(NodeId(15), 0), NodeInput::node(NodeId(4), 0), NodeInput::import(generic!(T), 2)],
 								..Default::default()
 							},
 							// 17: Max (clamp count to at least 1)
@@ -592,20 +592,20 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 					}),
 					inputs: vec![
 						NodeInput::value(TaggedValue::Vector(Default::default()), true),
-						NodeInput::value(TaggedValue::InterpolationDistribution(Default::default()), false),
-						NodeInput::value(TaggedValue::Vector(Default::default()), false),
 						NodeInput::value(TaggedValue::F64(10.), false),
 						NodeInput::value(TaggedValue::Bool(Default::default()), false),
+						NodeInput::value(TaggedValue::InterpolationDistribution(Default::default()), false),
+						NodeInput::value(TaggedValue::Vector(Default::default()), false),
 					],
 					..Default::default()
 				},
 				persistent_node_metadata: DocumentNodePersistentMetadata {
 					input_metadata: vec![
 						("Content", "TODO").into(),
-						("Distribution", "TODO").into(),
-						("Path", "TODO").into(),
 						("Count", "TODO").into(),
 						("Reverse", "TODO").into(),
+						("Distribution", "TODO").into(),
+						("Path", "TODO").into(),
 					],
 					output_names: vec!["Out".to_string()],
 					node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(0, 0)),