diff --git a/crates/formats/src/mesh_import/dae.rs b/crates/formats/src/mesh_import/dae.rs index 6c12c4cb..2608dcd1 100644 --- a/crates/formats/src/mesh_import/dae.rs +++ b/crates/formats/src/mesh_import/dae.rs @@ -74,7 +74,8 @@ fn read_inner(bytes: &[u8]) -> Result { sink.part = node.name.clone(); let uvs = mesh.uv_sets.first(); for part in &mesh.parts { - let material = part.material.and_then(|m| scene.materials.get(m)).filter(|m| !m.name.is_empty()).map_or("Default", |m| m.name.as_str()); + // An explicit empty name is a binding; only an absent material uses the default. + let material = part.material.and_then(|m| scene.materials.get(m)).map_or("Default", |m| m.name.as_str()); for face in part.faces() { let mut corners = Vec::with_capacity(face.len()); for c in face { diff --git a/crates/formats/src/mesh_import/scene_tests.rs b/crates/formats/src/mesh_import/scene_tests.rs index 573952c9..4abfd332 100644 --- a/crates/formats/src/mesh_import/scene_tests.rs +++ b/crates/formats/src/mesh_import/scene_tests.rs @@ -841,6 +841,16 @@ fn dae_attribute_and_text_entities_are_decoded() { assert!((cam.fov - 30.0).abs() < 1e-3, "{cam:?}"); } +#[test] +fn dae_empty_material_binding_stays_distinct_from_named_default() { + let dae = DAE.replace(r#"name="Red""#, r#"name="""#).replace(r#"name="Blue""#, r#"name="Default""#); + let m = import_mesh_bytes("scene.dae", dae.as_bytes()).unwrap().mesh; + assert_eq!(m.materials.len(), 2); + let material_for = |part: &str| m.submeshes.iter().find(|s| s.name == part).map(|s| m.materials[s.material].as_str()); + assert_eq!(material_for("child"), Some("")); + assert_eq!(material_for("other"), Some("Default")); +} + #[test] fn glb_export_round_trips_with_textures() { let mesh = texturecraft_geom::primitives::material_ball();