diff --git a/deny.toml b/deny.toml index 6eab00bd9..82b0fed07 100644 --- a/deny.toml +++ b/deny.toml @@ -45,6 +45,7 @@ db-urls = ["https://github.com/rustsec/advisory-db"] ignore = [ "RUSTSEC-2024-0370", # Unmaintained but still fully functional crate `proc-macro-error` "RUSTSEC-2024-0388", # Unmaintained but still fully functional crate `derivative` + "RUSTSEC-2025-0007", # Unmaintained but still fully functional crate `ring` ] # Threshold for security vulnerabilities, any vulnerability with a CVSS score # lower than the range specified will be ignored. Note that ignored advisories diff --git a/editor/build.rs b/editor/build.rs index 0e9f5c9c8..7fc95d9c5 100644 --- a/editor/build.rs +++ b/editor/build.rs @@ -1,6 +1,6 @@ use std::process::Command; -const GRAPHITE_RELEASE_SERIES: &str = "Alpha 3"; +const GRAPHITE_RELEASE_SERIES: &str = "Alpha 4"; fn main() { // Execute a Git command for its stdout. Early exit if it fails for any of the possible reasons. diff --git a/editor/src/messages/input_mapper/input_mappings.rs b/editor/src/messages/input_mapper/input_mappings.rs index 034727342..211d4cf98 100644 --- a/editor/src/messages/input_mapper/input_mappings.rs +++ b/editor/src/messages/input_mapper/input_mappings.rs @@ -140,7 +140,7 @@ pub fn input_mappings() -> Mapping { // NavigateToolMessage entry!(KeyDown(MouseLeft); action_dispatch=NavigateToolMessage::ZoomCanvasBegin), entry!(KeyDown(MouseLeft); modifiers=[Alt], action_dispatch=NavigateToolMessage::TiltCanvasBegin), - entry!(PointerMove; refresh_keys=[Control], action_dispatch=NavigateToolMessage::PointerMove { snap: Control }), + entry!(PointerMove; refresh_keys=[Shift], action_dispatch=NavigateToolMessage::PointerMove { snap: Shift }), entry!(KeyUp(MouseLeft); action_dispatch=NavigateToolMessage::PointerUp { zoom_in: true }), entry!(KeyUp(MouseLeft); modifiers=[Shift], action_dispatch=NavigateToolMessage::PointerUp { zoom_in: false }), // diff --git a/website/content/blog/2025-01-16-year-in-review-2024-highlights-and-a-peek-at-2025.md b/website/content/blog/2025-01-16-year-in-review-2024-highlights-and-a-peek-at-2025.md index 57a225ce7..c2376abf5 100644 --- a/website/content/blog/2025-01-16-year-in-review-2024-highlights-and-a-peek-at-2025.md +++ b/website/content/blog/2025-01-16-year-in-review-2024-highlights-and-a-peek-at-2025.md @@ -95,7 +95,7 @@ Lower-left: Godot's presence at GDC; Lower-right: Francesco Siddi (1) and Dalai Felinto (2) from the Blender Foundation with me (3) and Oliver (4) -With March now just around the corner, I am definitely looking forward to the next conference. If you will be in town for GDC 2025 and would like to meet up (or if you have an opportunity to hook us up with spare expo passes), please [get in touch](/contact). +With March now just around the corner, I am definitely looking forward to the next conference. If you will be in town for GDC 2025 and would like to meet up, please [get in touch](/contact). ### Blender Conference LA diff --git a/website/content/features.md b/website/content/features.md index a157d536c..baeb5eace 100644 --- a/website/content/features.md +++ b/website/content/features.md @@ -110,7 +110,7 @@ Always on the bleeding edge and built to last— Graphite is written on a robust Node graph integration in documents -