Merge pull request #1808 from hannobraun/update

Update dependencies
hannobraun · May 1, 2023 · 55dec8e · 55dec8e
2 parents a2579f6 + d4c6013
commit 55dec8e
Show file tree

Hide file tree

Showing 11 changed files with 139 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fj-app/Cargo.toml b/crates/fj-app/Cargo.toml
@@ -11,7 +11,7 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.71"
 fj.workspace = true
 fj-export.workspace = true
 fj-host.workspace = true
@@ -23,7 +23,7 @@ fj-viewer.workspace = true
 fj-window.workspace = true
 
 [dependencies.clap]
-version = "4.2.4"
+version = "4.2.5"
 features = ["derive", "string"]
 
 [dependencies.figment]

diff --git a/crates/fj-kernel/Cargo.toml b/crates/fj-kernel/Cargo.toml
@@ -23,4 +23,4 @@ type-map = "0.5.0"
 
 [dev-dependencies]
 pretty_assertions = "1.3.0"
-anyhow = "1.0.70"
+anyhow = "1.0.71"
diff --git a/crates/fj-viewer/Cargo.toml b/crates/fj-viewer/Cargo.toml
@@ -18,7 +18,7 @@ egui-wgpu = "0.21.0"
 fj-interop.workspace = true
 fj-math.workspace = true
 nalgebra = "0.32.2"
-tobj = "3.2.5"
+tobj = "4.0.0"
 raw-window-handle = "0.5.2"
 thiserror = "1.0.40"
 tracing = "0.1.37"

diff --git a/crates/fj-viewer/src/graphics/model.rs b/crates/fj-viewer/src/graphics/model.rs
@@ -95,7 +95,10 @@ pub fn load_model(
 
     let mut materials = Vec::new();
     for m in obj_materials? {
-        let texture_data: &[u8] = assets.get_asset(m.diffuse_texture.as_str());
+        let texture_data: &[u8] = match m.diffuse_texture {
+            Some(diffuse_texture) => assets.get_asset(diffuse_texture.as_str()),
+            None => continue,
+        };
 
         let diffuse_texture = texture::Texture::from_bytes(
             device,