Merge branch 'codex/fbx-package' into codex/fbx-integration

This commit is contained in:
Dylan M. Taylor committed 2026-11-15 18:54:28 +00:00
commit 8355676df4
2 files changed
+15 -15

No files matched your search

+6 -6
View File
@@ -1087,12 +1087,12 @@ impl Document {
paths.push(path);
}
}
if !paths.is_empty() {
if let Some(bytes) = resolve(&paths) {
budget.take(Some(bytes.len()), "a resolved image")?;
image = Some(bytes);
break;
}
if !paths.is_empty()
&& let Some(bytes) = resolve(&paths)
{
budget.take(Some(bytes.len()), "a resolved image")?;
image = Some(bytes);
break;
}
}
}
+9 -9
View File
@@ -95,16 +95,16 @@ pub fn write(
return Some(data.clone());
}
for path in paths {
if let Some(name) = below(path) {
if let Some(data) = found(path).filter(|d| d.len() as u64 <= package_limits.max_texture_bytes) {
total = total.saturating_add(data.len() as u64);
if total > package_limits.max_total_bytes {
exceeded = true;
return None;
}
files.push((name, data.clone()));
return Some(data);
if let Some(name) = below(path)
&& let Some(data) = found(path).filter(|d| d.len() as u64 <= package_limits.max_texture_bytes)
{
total = total.saturating_add(data.len() as u64);
if total > package_limits.max_total_bytes {
exceeded = true;
return None;
}
files.push((name, data.clone()));
return Some(data);
}
}
if let Some(first) = paths.first().filter(|p| !missing.iter().any(|m| m == **p)) {