aiongg
2df33d2f01
Merge remote-tracking branch 'upstream/main' into sync/main-1116
...
# Conflicts:
# Cargo.lock
# crates/audio/src/lib.rs
# crates/exr/src/decode.rs
# crates/font-catalog/src/lib.rs
# crates/ps/src/lib.rs
# crates/svg/Cargo.toml
# crates/text/Cargo.toml
# crates/text/src/lib.rs
# crates/video/Cargo.toml
# crates/video/src/lib.rs
2026-11-16 14:23:07 +00:00
FredApps
00149f5d83
Merge remote-tracking branch 'origin/main' into w1728
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-16 07:09:12 +01:00
FredApps
5e780f24e1
fbx package: refuse an oversized model up front and stop resolving once the byte limit is passed
2026-11-16 05:26:28 +01:00
FredApps
2ecbd1e9cd
fbx: integer index arrays in strict mode, cache package textures, set-based missing dedup
2026-11-16 05:04:55 +01:00
FredApps
0479988f65
fbx package: entry limit counts only resolved textures; report overflow before the no-texture return
2026-11-16 04:39:34 +01:00
FredApps
82597f403d
fbx: strict check for ColorsIndex/NormalIndex, stop texture resolution at the entry limit, model entry keeps .fbx
2026-11-16 03:13:21 +01:00
aiongg
dffc61a7e0
Merge storytold main 832883b5 (sync 16 Nov)
...
961 upstream commits since 7bb6c900 . Resolutions:
- Test-only conflicts: upstream tests from before the base that our side
cut stay cut; tests new upstream are kept (audio aac/config, layout,
encode_format; cms lutfile; media mux; print windows_native, ticket;
update self_update; xml hostile).
- Code our side moved, with upstream's change carried to the new place:
craft-media mux roll sample groups (mux/boxes.rs) and writer-start
offsets with overflow checks (mux/progressive.rs); craft-print's
shrink-to-fit scale guard (sheets/plan.rs); craft-update's nextest
archive detection (self_update/detect.rs); craft-vectorcraft-format's
Tail::write_to_with (container.rs); craft-i18n's pedantic fixes
(bidi.rs, negotiation.rs).
- craft-ui: the old crate's modules stay removed; gpu_test_lock guarded
their per-test wgpu renderers, which the snapshot kit does not have.
- New upstream tests in crates that build their integration tests into
the library's test executable are modules of tests/main.rs (audio
flac_decode and qoa_oracle, cms, docpath, pcraft-format,
vectorcraft-format).
- The 22 new crates are optional members of the craft facade.
2026-11-16 01:52:09 +00:00
FredApps
6ec4c31355
mesh: FBX material IDs per corner/control point, texture candidate order
...
Addresses CodeRabbit on #1777 : ByPolygonVertex/ByControlPoint material IDs use the
polygon's first corner instead of the polygon number; an earlier texture candidate
is tried before a later cached one; regression test for strict colours reading the
validated layer.
2026-11-16 02:16:29 +01:00
FredApps
d4f5f1e0c4
Merge remote-tracking branch 'origin/main' into w1777
2026-11-16 02:14:58 +01:00
FredApps
1448b89a2a
Fix merged FBX test boundaries
2026-11-16 00:20:35 +01:00
FredApps
095ba1ce29
Merge remote-tracking branch 'origin/codex/fbx-package' into fredapps/i778-fbx-batch
2026-11-16 00:19:57 +01:00
FredApps
891d59c6df
Merge remote-tracking branch 'origin/codex/fbx-diffuse-materials' into fredapps/i778-fbx-batch
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-16 00:19:57 +01:00
FredApps
52e5b88dbb
Merge remote-tracking branch 'origin/codex/fbx-strict-ascii' into fredapps/i778-fbx-batch
2026-11-16 00:19:57 +01:00
FredApps
029137bf87
Merge remote-tracking branch 'origin/codex/fbx-ascii-budget' into fredapps/i778-fbx-batch
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-16 00:19:57 +01:00
FredApps
442dec34e5
Merge remote-tracking branch 'origin/codex/fbx-color-layers' into fredapps/i778-fbx-batch
...
# Conflicts:
# crates/mesh/src/fbx.rs
# crates/mesh/src/tests/fbx.rs
2026-11-16 00:19:57 +01:00
FredApps
d9e2bc634e
Merge remote-tracking branch 'origin/codex/fbx-all-geometry' into fredapps/i778-fbx-batch
...
# Conflicts:
# crates/mesh/src/fbx.rs
# crates/mesh/src/tests/fbx.rs
2026-11-16 00:19:34 +01:00
FredApps
59ab99fe8c
Merge remote-tracking branch 'origin/codex/fbx-camera-scene' into fredapps/i778-fbx-batch
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-16 00:19:24 +01:00
FredApps
0c33cf0bb5
Merge remote-tracking branch 'origin/codex/fbx-material-slots' into fredapps/i778-fbx-batch
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-16 00:19:24 +01:00
FredApps
42f06b384c
Merge remote-tracking branch 'origin/codex/fbx-binary-budget' into fredapps/i778-fbx-batch
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-16 00:19:24 +01:00
FredApps
476f0b08ba
Merge remote-tracking branch 'origin/main' into fbx-layer
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-15 23:56:06 +01:00
FredApps
e42b9e1696
Merge pull request #1731 from storytold/codex/obj-compat-options
...
Expose compatible OBJ read options
2026-11-15 23:55:19 +01:00
FredApps
3a8c6aef3e
Merge pull request #1730 from storytold/codex/obj-stream-bounds
...
Bound OBJ face and continued-line parsing
2026-11-15 23:54:59 +01:00
Dylan M. Taylor
316d40376e
Keep OBJ declaration groups across smoothing changes
2026-11-15 19:19:15 +00:00
Dylan M. Taylor
2ee29d87b5
Preserve repeated OBJ group declarations
2026-11-15 19:18:54 +00:00
Dylan M. Taylor
284b0d815b
Expose compatible OBJ read options
2026-11-15 19:15:02 +00:00
Dylan M. Taylor
40b9b7ef45
Bound OBJ face and continued-line parsing
2026-11-15 19:13:32 +00:00
Dylan M. Taylor
4f9c718985
Identify the source model of each FBX placement
2026-11-15 19:09:27 +00:00
Dylan M. Taylor
e469ec0558
Expose FBX placement and polygon order
2026-11-15 19:07:13 +00:00
Dylan M. Taylor
0a7bab2bed
Merge branch 'codex/fbx-color-layers' into codex/fbx-integration
2026-11-15 18:57:35 +00:00
Dylan M. Taylor
9b43d91e1d
Bound FBX color seam staging memory
2026-11-15 18:57:25 +00:00
Dylan M. Taylor
afea2ec3c5
Merge branch 'codex/fbx-parent-policy' into codex/fbx-integration
2026-11-15 18:54:29 +00:00
Dylan M. Taylor
8355676df4
Merge branch 'codex/fbx-package' into codex/fbx-integration
2026-11-15 18:54:28 +00:00
Dylan M. Taylor
7bb004892a
Merge branch 'codex/fbx-color-layers' into codex/fbx-integration
2026-11-15 18:54:28 +00:00
Dylan M. Taylor
7826b2524a
Merge branch 'codex/fbx-diffuse-materials' into codex/fbx-package
2026-11-15 18:54:20 +00:00
Dylan M. Taylor
ea178b2d1c
Merge branch 'codex/fbx-strict-geometry' into codex/fbx-parent-policy
2026-11-15 18:54:20 +00:00
Dylan M. Taylor
0984808dd7
Fix FBX diffuse clippy warning
2026-11-15 18:54:08 +00:00
Dylan M. Taylor
d4c2eb7b74
Fix FBX color clippy warning
2026-11-15 18:54:08 +00:00
Dylan M. Taylor
827eddfdbd
Fix FBX package clippy warning
2026-11-15 18:54:08 +00:00
Dylan M. Taylor
ce5f671c22
Fix strict FBX geometry clippy warning
2026-11-15 18:54:08 +00:00
Dylan M. Taylor
ea36ee23df
Merge branch 'codex/fbx-strict-ascii' into codex/fbx-integration
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-15 18:52:43 +00:00
Dylan M. Taylor
22bbfe934a
Require a binary FBX closing record in strict mode
2026-11-15 18:52:22 +00:00
Dylan M. Taylor
1ef59f8905
Merge branch 'codex/fbx-parent-policy' into codex/fbx-integration
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-15 18:50:34 +00:00
Dylan M. Taylor
39b7076b04
Allow object-only FBX hierarchy connections
2026-11-15 18:50:08 +00:00
Dylan M. Taylor
fd97d5b1fe
Merge branch 'codex/fbx-binary-budget' into codex/fbx-integration
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-15 18:48:16 +00:00
Dylan M. Taylor
ad0205e903
Bound binary FBX record and property allocations
2026-11-15 18:47:54 +00:00
Dylan M. Taylor
e91ff87185
Merge branch 'codex/fbx-material-slots' into codex/fbx-integration
...
# Conflicts:
# crates/mesh/src/fbx.rs
# crates/mesh/src/tests/fbx.rs
2026-11-15 18:45:43 +00:00
Dylan M. Taylor
a4977030c0
Preserve FBX material slot assignments
2026-11-15 18:45:14 +00:00
Dylan M. Taylor
f4edcdcad9
Merge branch 'codex/fbx-parent-policy' into codex/fbx-integration
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-15 18:43:33 +00:00
Dylan M. Taylor
818f05566e
Allow last FBX parent connection to win
2026-11-15 18:43:10 +00:00
Dylan M. Taylor
17e18e31c2
Merge branch 'codex/fbx-strict-ascii' into codex/fbx-integration
...
# Conflicts:
# crates/mesh/src/tests/fbx.rs
2026-11-15 18:41:09 +00:00