Merge remote-tracking branch 'upstream/main' into fix/6085-text-caret-contrast

crates/algo/src/features.rs

@@ -700,11 +700,14 @@ mod parallel_tests {
             .collect()
     }
 
-    /// Blocks of random brightness: lots of strong corners, no libm in the making.
+    /// Blocks of random brightness: lots of strong corners, no libm in the making. Only the
+    /// recorded-hash test below uses it, and that one is Linux x86_64 only.
+    #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
     fn blocks(w: usize, h: usize, seed: u64) -> Vec<f32> {
         (0..w * h).map(|i| (mix(seed + ((i % w) / 8) as u64 * 4096 + ((i / w) / 8) as u64) >> 40) as f32 / 16_777_216.0).collect()
     }
 
+    #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
     fn fnv(parts: &[u64]) -> u64 {
         let mut h = 0xcbf2_9ce4_8422_2325u64;
         for p in parts {

crates/engine/src/presets/mod.rs

@@ -186,6 +186,7 @@ impl Session {
             tool_presets: take(&mut m, "tool_presets"),
             documents: take(&mut m, "documents"),
             recent_documents: take(&mut m, "recent_documents"),
+            export_presets: take(&mut m, "export_presets"),
             custom_shapes: take(&mut m, "custom_shapes"),
             layer_defaults: take(&mut m, "layer_defaults"),
             swatches: take(&mut m, "swatches"),