diff --git a/crates/formats/src/project_file/mod.rs b/crates/formats/src/project_file/mod.rs index 40065eef..fd13bec2 100644 --- a/crates/formats/src/project_file/mod.rs +++ b/crates/formats/src/project_file/mod.rs @@ -483,13 +483,11 @@ fn load_with_budget(reader: R, mut budget: LoadBudget) -> Result /// Older files hold bent normal maps in world space, which every reader now takes as tangent /// space: drop them (the bake settings stay) and ask for a re-bake. fn drop_world_space_bent_normals(pf: &mut ProjectFile) { - for maps in pf.baked.values_mut() { - maps.maps.remove(&BakedMap::BentNormal); - } - // The declaration goes for every set, with or without pixels, so a set that only declared it is told too + // Pixels and declaration go for every set, either one alone is enough to name the set in the warning let mut names = Vec::new(); - for set in &mut pf.project.texture_sets { - if set.baked.remove(&BakedMap::BentNormal) { + for (i, set) in pf.project.texture_sets.iter_mut().enumerate() { + let had_pixels = pf.baked.get_mut(&i).is_some_and(|maps| maps.maps.remove(&BakedMap::BentNormal).is_some()); + if set.baked.remove(&BakedMap::BentNormal) || had_pixels { names.push(format!("\"{}\"", set.name)); } } diff --git a/crates/formats/src/project_file/tests.rs b/crates/formats/src/project_file/tests.rs index 9fae7a72..4364f39e 100644 --- a/crates/formats/src/project_file/tests.rs +++ b/crates/formats/src/project_file/tests.rs @@ -123,6 +123,19 @@ fn a_bent_normal_declared_without_pixels_in_an_older_project_is_dropped_and_repo assert!(older.warnings[0].contains("\"A\""), "{}", older.warnings[0]); } +#[test] +fn a_bent_normal_with_pixels_but_no_declaration_in_an_older_project_is_dropped_and_reported() { + let mut sample = sample(); + let bent = Arc::new([0.5, 1.0, 0.5].repeat(16 * 16)); + sample.pf.baked.get_mut(&0).unwrap().maps.insert(BakedMap::BentNormal, bent); + assert!(!sample.pf.project.texture_sets[0].baked.contains(&BakedMap::BentNormal)); + sample.pf.project.format_version = TANGENT_BENT_NORMAL_VERSION - 1; + let older = load_project_bytes(&save_project_bytes(&sample.pf).unwrap()).unwrap(); + assert!(!older.baked[&0].maps.contains_key(&BakedMap::BentNormal)); + assert_eq!(older.warnings.len(), 1, "{:?}", older.warnings); + assert!(older.warnings[0].contains("\"A\""), "{}", older.warnings[0]); +} + #[test] fn world_space_bent_normals_of_older_projects_are_dropped_for_a_rebake() { let mut sample = sample();