diff --git a/node-graph/nodes/gstd/src/platform_application_io.rs b/node-graph/nodes/gstd/src/platform_application_io.rs index 1a5065e2b6..ca1d83c4f2 100644 --- a/node-graph/nodes/gstd/src/platform_application_io.rs +++ b/node-graph/nodes/gstd/src/platform_application_io.rs @@ -15,8 +15,6 @@ use core_types::transform::Footprint; #[cfg(target_family = "wasm")] use core_types::{ATTR_TRANSFORM, WasmNotSend}; use core_types::{Color, Ctx}; -#[cfg(target_family = "wasm")] -use graphic_types::ATTR_EDITOR_MERGED_LAYERS; pub use graph_craft::application_io::resource::{Resource, ResourceHash}; pub use graph_craft::application_io::*; pub use graph_craft::document::value::RenderOutputType; @@ -25,6 +23,8 @@ pub use graphene_canvas_utils as canvas_utils; #[cfg(target_family = "wasm")] use graphic_types::ATTR_EDITOR_MERGED_LAYERS; #[cfg(target_family = "wasm")] +use graphic_types::ATTR_EDITOR_MERGED_LAYERS; +#[cfg(target_family = "wasm")] use graphic_types::Graphic; #[cfg(target_family = "wasm")] use graphic_types::IntoGraphicList; diff --git a/node-graph/nodes/transform/src/transform_nodes.rs b/node-graph/nodes/transform/src/transform_nodes.rs index a113de0b5d..25628e51d4 100644 --- a/node-graph/nodes/transform/src/transform_nodes.rs +++ b/node-graph/nodes/transform/src/transform_nodes.rs @@ -97,10 +97,7 @@ fn replace_transform(_: impl Ctx + InjectFootprint, (element, _content_transf // TODO: Figure out how this node should behave once #2982 is implemented. /// Obtains the transform of the first lane of the input wire, if present. #[node_macro::node(category("Math: Transform"), path(core_types::vector))] -fn extract_transform( - _: impl Ctx, - #[implementations(Graphic, Vector, Raster, Raster, Color, GradientStops)] content: IList, -) -> DAffine2 { +fn extract_transform(_: impl Ctx, #[implementations(Graphic, Vector, Raster, Raster, Color, GradientStops)] content: IList) -> DAffine2 { match content.len() { 0 => DAffine2::default(), _ => content.lane(0).attr::(), diff --git a/node-graph/nodes/vector/src/vector_nodes.rs b/node-graph/nodes/vector/src/vector_nodes.rs index 4f0aeea893..efb2f1ae94 100644 --- a/node-graph/nodes/vector/src/vector_nodes.rs +++ b/node-graph/nodes/vector/src/vector_nodes.rs @@ -3594,10 +3594,7 @@ fn point_inside(_: impl Ctx, source: IList, point: DVec2) -> bool { // TODO: Return u32, u64, or usize instead of f64 after #1621 is resolved and has allowed us to implement automatic type conversion in the node graph for nodes with generic type inputs. // TODO: (Currently automatic type conversion only works for concrete types, via the Graphene preprocessor and not the full Graphene type system.) #[node_macro::node(category("General"), path(graphene_core::vector))] -fn count_elements( - _: impl Ctx, - #[implementations(Graphic, Artboard, Vector, Raster, Color, GradientStops, String)] content: IList, -) -> f64 { +fn count_elements(_: impl Ctx, #[implementations(Graphic, Artboard, Vector, Raster, Color, GradientStops, String)] content: IList) -> f64 { content.len() as f64 }