Rename nodes 'Blend' -> 'Mix' and 'Blend Shapes' to 'Blend'

Keavon · Keavon · commit 5f38106c68b8 · 2026-03-29T00:26:57.000-07:00
diff --git a/.branding b/.branding
@@ -1,2 +1,2 @@
-https://github.com/Keavon/graphite-branded-assets/archive/169a596963b81d00f34b06340383708866b53a4c.tar.gz
-4f5b1fadb8e40ddf565a304a49a09724040c8221ea1ee1e6b825b43c900c05fc
+https://github.com/Keavon/graphite-branded-assets/archive/fc02baf37d7428e86aa0e5f772c1f6e42173d405.tar.gz
+061a880c753472ea0a84fbc09e54d3596bea6e299067169d34347c717de13ded
diff --git a/editor/src/consts.rs b/editor/src/consts.rs
@@ -188,4 +188,4 @@ pub const UI_SCALE_MIN: f64 = 0.5;
 pub const UI_SCALE_MAX: f64 = 3.;
 
 // ACTIONS
-pub const BLEND_SHAPE_COUNT_PER_LAYER: usize = 10;
+pub const BLEND_COUNT_PER_LAYER: usize = 10;
diff --git a/editor/src/messages/menu_bar/menu_bar_message_handler.rs b/editor/src/messages/menu_bar/menu_bar_message_handler.rs
@@ -497,13 +497,13 @@ impl LayoutHolder for MenuBarMessageHandler {
 							]]),
 						MenuListEntry::new("Blend")
 							.label("Blend")
-							.icon("BlendShapes")
+							.icon("InterpolationBlend")
 							.tooltip_shortcut(action_shortcut!(DocumentMessageDiscriminant::BlendSelectedLayers))
 							.on_commit(|_| DocumentMessage::BlendSelectedLayers.into())
 							.disabled(no_active_document || !has_selected_layers),
 						MenuListEntry::new("Morph")
 							.label("Morph")
-							.icon("Morph")
+							.icon("InterpolationMorph")
 							.tooltip_shortcut(action_shortcut!(DocumentMessageDiscriminant::MorphSelectedLayers))
 							.on_commit(|_| DocumentMessage::MorphSelectedLayers.into())
 							.disabled(no_active_document || !has_selected_layers),
diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs
@@ -5,7 +5,7 @@ use super::utility_types::network_interface::{self, NodeNetworkInterface, Transa
 use super::utility_types::nodes::{CollapsedLayers, LayerStructureEntry, SelectedNodes};
 use crate::application::{GRAPHITE_GIT_COMMIT_HASH, generate_uuid};
 use crate::consts::{
-	ASYMPTOTIC_EFFECT, BLEND_SHAPE_COUNT_PER_LAYER, COLOR_OVERLAY_GRAY, DEFAULT_DOCUMENT_NAME, FILE_EXTENSION, LAYER_INDENT_OFFSET, NODE_CHAIN_WIDTH, SCALE_EFFECT, SCROLLBAR_SPACING,
+	ASYMPTOTIC_EFFECT, BLEND_COUNT_PER_LAYER, COLOR_OVERLAY_GRAY, DEFAULT_DOCUMENT_NAME, FILE_EXTENSION, LAYER_INDENT_OFFSET, NODE_CHAIN_WIDTH, SCALE_EFFECT, SCROLLBAR_SPACING,
 	VIEWPORT_ROTATE_SNAP_INTERVAL,
 };
 use crate::messages::input_mapper::utility_types::macros::action_shortcut;
@@ -626,7 +626,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
 				responses.add(OverlaysMessage::Draw);
 			}
 			DocumentMessage::BlendSelectedLayers => {
-				self.handle_group_selected_layers(GroupFolderType::BlendShapes, responses);
+				self.handle_group_selected_layers(GroupFolderType::Blend, responses);
 			}
 			DocumentMessage::MorphSelectedLayers => {
 				self.handle_group_selected_layers(GroupFolderType::Morph, responses);
@@ -1970,10 +1970,10 @@ impl DocumentMessageHandler {
 					});
 				}
 			}
-			GroupFolderType::BlendShapes | GroupFolderType::Morph => {
+			GroupFolderType::Blend | GroupFolderType::Morph => {
 				let control_path_id = NodeId(generate_uuid());
 				let all_layers_to_group = network_interface.shallowest_unique_layers_sorted(&[]);
-				let blend_count = matches!(group_folder_type, GroupFolderType::BlendShapes).then(|| all_layers_to_group.len() * BLEND_SHAPE_COUNT_PER_LAYER);
+				let blend_count = matches!(group_folder_type, GroupFolderType::Blend).then(|| all_layers_to_group.len() * BLEND_COUNT_PER_LAYER);
 
 				responses.add(GraphOperationMessage::NewInterpolationLayer {
 					id: folder_id,
diff --git a/editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs b/editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs
@@ -182,9 +182,9 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 				let mut modify_inputs = ModifyInputsContext::new(network_interface, responses);
 				let layer = modify_inputs.create_layer(id);
 
-				// Insert the main chain node (Blend Shapes or Morph) depending on whether a blend count is provided
+				// Insert the main chain node (Blend or Morph) depending on whether a blend count is provided
 				let (chain_node_id, layer_alias, path_alias) = if let Some(count) = blend_count {
-					(modify_inputs.insert_blend_shapes_data(layer, count as f64), "Blend Shape", "Blend Path")
+					(modify_inputs.insert_blend_data(layer, count as f64), "Blend", "Blend Path")
 				} else {
 					(modify_inputs.insert_morph_data(layer), "Morph", "Morph Path")
 				};
@@ -196,7 +196,7 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 				network_interface.move_layer_to_stack(layer, parent, insert_index, &[]);
 				network_interface.move_layer_to_stack(control_path_layer, parent, insert_index + 1, &[]);
 
-				// Connect the Path node's output to the chain node's path parameter input (input 4 for both Morph and Blend Shapes).
+				// Connect the Path node's output to the chain node's path parameter input (input 4 for both Morph and Blend).
 				// Done after move_layer_to_stack so chain nodes have correct positions when converted to absolute.
 				network_interface.set_input(&InputConnector::node(chain_node_id, 4), NodeInput::node(path_node_id, 0), &[]);
 
@@ -213,7 +213,7 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 				interpolation_layer_id,
 				control_path_id,
 			} => {
-				// Find the chain node (Morph or Blend Shapes, first in chain of the layer)
+				// Find the chain node (Blend or Morph, first in chain of the layer)
 				let Some(OutputConnector::Node { node_id: chain_node, .. }) = network_interface.upstream_output_connector(&InputConnector::node(interpolation_layer_id, 1), &[]) else {
 					log::error!("Could not find chain node for layer {interpolation_layer_id}");
 					return;
diff --git a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs
@@ -156,17 +156,17 @@ impl<'a> ModifyInputsContext<'a> {
 		self.network_interface.move_node_to_chain_start(&boolean_id, layer, &[], self.import);
 	}
 
-	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([
+	pub fn insert_blend_data(&mut self, layer: LayerNodeIdentifier, count: f64) -> NodeId {
+		let blend = resolve_network_node_type("Blend").expect("Blend node does not exist").node_template_input_override([
 			Some(NodeInput::value(TaggedValue::Graphic(Default::default()), true)),
 			Some(NodeInput::value(TaggedValue::F64(count), false)),
 		]);
 
-		let blend_shapes_id = NodeId::new();
-		self.network_interface.insert_node(blend_shapes_id, blend_shapes, &[]);
-		self.network_interface.move_node_to_chain_start(&blend_shapes_id, layer, &[], self.import);
+		let blend_id = NodeId::new();
+		self.network_interface.insert_node(blend_id, blend, &[]);
+		self.network_interface.move_node_to_chain_start(&blend_id, layer, &[], self.import);
 
-		blend_shapes_id
+		blend_id
 	}
 
 	pub fn insert_morph_data(&mut self, layer: LayerNodeIdentifier) -> NodeId {
diff --git a/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs b/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs
@@ -462,7 +462,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 			properties: None,
 		},
 		DocumentNodeDefinition {
-			identifier: "Blend Shapes",
+			identifier: "Blend",
 			category: "Vector",
 			node_template: NodeTemplate {
 				document_node: DocumentNode {
diff --git a/editor/src/messages/portfolio/document/utility_types/misc.rs b/editor/src/messages/portfolio/document/utility_types/misc.rs
@@ -1,5 +1,6 @@
 use crate::consts::COLOR_OVERLAY_GRAY;
 use glam::DVec2;
+use graphene_std::vector::misc::BooleanOperation;
 use std::fmt;
 
 #[repr(transparent)]
@@ -710,7 +711,7 @@ impl PTZ {
 #[derive(Clone, Copy, Debug, PartialEq, serde::Serialize, serde::Deserialize)]
 pub enum GroupFolderType {
 	Layer,
-	BooleanOperation(graphene_std::vector::misc::BooleanOperation),
-	BlendShapes,
+	BooleanOperation(BooleanOperation),
+	Blend,
 	Morph,
 }
diff --git a/editor/src/messages/portfolio/document_migration.rs b/editor/src/messages/portfolio/document_migration.rs
@@ -474,13 +474,14 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 		],
 	},
 	NodeReplacement {
-		node: graphene_std::raster_nodes::blending_nodes::blend::IDENTIFIER,
+		node: graphene_std::raster_nodes::blending_nodes::mix::IDENTIFIER,
 		aliases: &[
 			"graphene_raster_nodes::adjustments::BlendNode",
 			"raster_nodes::adjustments::BlendNode",
 			"graphene_core::raster::adjustments::BlendNode",
 			"graphene_core::raster::BlendNode",
 			"graphene_raster_nodes::blending_nodes::BlendNode",
+			"raster_nodes::blending_nodes::BlendNode",
 		],
 	},
 	NodeReplacement {
diff --git a/frontend/src/icons.ts b/frontend/src/icons.ts
@@ -110,7 +110,6 @@ import AlignRight from "/../branding/assets/icon-16px-solid/align-right.svg";
 import AlignTop from "/../branding/assets/icon-16px-solid/align-top.svg";
 import AlignVerticalCenter from "/../branding/assets/icon-16px-solid/align-vertical-center.svg";
 import Artboard from "/../branding/assets/icon-16px-solid/artboard.svg";
-import BlendShapes from "/../branding/assets/icon-16px-solid/blend-shapes.svg";
 import BooleanDifference from "/../branding/assets/icon-16px-solid/boolean-difference.svg";
 import BooleanDivide from "/../branding/assets/icon-16px-solid/boolean-divide.svg";
 import BooleanIntersect from "/../branding/assets/icon-16px-solid/boolean-intersect.svg";
@@ -155,9 +154,10 @@ import HistoryRedo from "/../branding/assets/icon-16px-solid/history-redo.svg";
 import HistoryUndo from "/../branding/assets/icon-16px-solid/history-undo.svg";
 import IconsGrid from "/../branding/assets/icon-16px-solid/icons-grid.svg";
 import Image from "/../branding/assets/icon-16px-solid/image.svg";
+import InterpolationBlend from "/../branding/assets/icon-16px-solid/interpolation-blend.svg";
+import InterpolationMorph from "/../branding/assets/icon-16px-solid/interpolation-morph.svg";
 import Layer from "/../branding/assets/icon-16px-solid/layer.svg";
 import License from "/../branding/assets/icon-16px-solid/license.svg";
-import Morph from "/../branding/assets/icon-16px-solid/morph.svg";
 import NewLayer from "/../branding/assets/icon-16px-solid/new-layer.svg";
 import NodeBlur from "/../branding/assets/icon-16px-solid/node-blur.svg";
 import NodeBrushwork from "/../branding/assets/icon-16px-solid/node-brushwork.svg";
@@ -229,7 +229,6 @@ const SOLID_16PX = {
 	AlignTop: { svg: AlignTop, size: 16 },
 	AlignVerticalCenter: { svg: AlignVerticalCenter, size: 16 },
 	Artboard: { svg: Artboard, size: 16 },
-	BlendShapes: { svg: BlendShapes, size: 16 },
 	BooleanDifference: { svg: BooleanDifference, size: 16 },
 	BooleanDivide: { svg: BooleanDivide, size: 16 },
 	BooleanIntersect: { svg: BooleanIntersect, size: 16 },
@@ -274,9 +273,10 @@ const SOLID_16PX = {
 	HistoryUndo: { svg: HistoryUndo, size: 16 },
 	IconsGrid: { svg: IconsGrid, size: 16 },
 	Image: { svg: Image, size: 16 },
+	InterpolationBlend: { svg: InterpolationBlend, size: 16 },
+	InterpolationMorph: { svg: InterpolationMorph, size: 16 },
 	Layer: { svg: Layer, size: 16 },
 	License: { svg: License, size: 16 },
-	Morph: { svg: Morph, size: 16 },
 	NewLayer: { svg: NewLayer, size: 16 },
 	Node: { svg: Node, size: 16 },
 	NodeBlur: { svg: NodeBlur, size: 16 },
diff --git a/node-graph/nodes/raster/src/blending_nodes.rs b/node-graph/nodes/raster/src/blending_nodes.rs
@@ -130,7 +130,7 @@ pub fn apply_blend_mode(foreground: Color, background: Color, blend_mode: BlendM
 }
 
 #[node_macro::node(category("Raster"), cfg(feature = "std"))]
-fn blend<T: Blend<Color> + Send>(
+fn mix<T: Blend<Color> + Send>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
