From a1b50a86c450bd3d3065e320516bd7817aa7b047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Wed, 16 Dec 2020 10:56:00 +0100
Subject: [PATCH] update guillotiere

---
 Cargo.lock                 | 8 ++++----
 voxygen/Cargo.toml         | 2 +-
 voxygen/src/mesh/greedy.rs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 04fb72ea68..6c53e4a02f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1656,9 +1656,9 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.20.14"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad"
+checksum = "5337024b8293bdce5265dc9570ef6e608a34bfacbbc87fe1a5dcb5f1dac2f4e2"
 dependencies = [
  "num-traits 0.2.14",
 ]
@@ -2219,9 +2219,9 @@ dependencies = [
 
 [[package]]
 name = "guillotiere"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47065d052e2f000066c4ffbea7051e55bff5c1532c400fc1e269492b2474ccc1"
+checksum = "bc7cccefbf418f663e11e9500326f46a44273dc598210bbedc8bbe95e696531f"
 dependencies = [
  "euclid",
  "svg_fmt",
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 625fdff81f..dfb7b9d8ad 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -70,7 +70,7 @@ directories-next = "2.0"
 dot_vox = "4.0"
 enum-iterator = "0.6"
 glsl-include = "0.3.1"
-guillotiere = "0.5.2"
+guillotiere = "0.6"
 hashbrown = {version = "0.7.2", features = ["rayon", "serde", "nightly"]}
 image = {version = "0.23.12", default-features = false, features = ["ico", "png"]}
 native-dialog = { version = "0.4.2", default-features = false, optional = true }
diff --git a/voxygen/src/mesh/greedy.rs b/voxygen/src/mesh/greedy.rs
index 46d13141fa..545ed7e7bb 100644
--- a/voxygen/src/mesh/greedy.rs
+++ b/voxygen/src/mesh/greedy.rs
@@ -119,7 +119,7 @@ impl<'a> GreedyMesh<'a> {
         let size = guillotiere::Size::new(32, 32).min(max_size);
         let atlas =
             guillotiere::SimpleAtlasAllocator::with_options(size, &guillotiere::AllocatorOptions {
-                snap_size: 1,
+                alignment: guillotiere::Size::default(),
                 small_size_threshold,
                 large_size_threshold,
             });