Upgrade to tobj 4.0.0

hannobraun · May 1, 2023 · 9e7900c · 9e7900c
1 parent dcc4007
commit 9e7900c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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,