Fix T98604: FBX import does not handle some framerate codes.

Add missing values to the `FBX_FRAMERATES` data, including those that
Blender does not really support (the NTSC 'drop frames' variants, better
to have them mapped to regular NTSC framerate than completely ignored).
This commit is contained in:
Bastien Montagne 2022-06-13 12:15:39 +02:00
parent ebe0bd5677
commit b91319aead
Notes: blender-bot 2023-02-14 18:19:24 +01:00
Referenced by issue #101277, Exported files can't be opened in Mixamo
Referenced by issue #99876, FBX exporting animation with 1 fps
Referenced by issue #98604, FBX Import Resets Framerate to 25fps Incorrectly
2 changed files with 10 additions and 3 deletions

View File

@ -3,7 +3,7 @@
bl_info = {
"name": "FBX format",
"author": "Campbell Barton, Bastien Montagne, Jens Restemeier",
"version": (4, 36, 0),
"version": (4, 36, 1),
"blender": (3, 2, 0),
"location": "File > Import-Export",
"description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions",

View File

@ -112,21 +112,28 @@ RIGHT_HAND_AXES = {
}
# NOTE: Not fully in enum value order, since when exporting the first entry matching the framerate value is used
# (e.g. better have NTSC fullframe than NTSC drop frame for 29.97 framerate).
FBX_FRAMERATES = (
#(-1.0, 0), # Default framerate.
(-1.0, 14), # Custom framerate.
(120.0, 1),
(100.0, 2),
(60.0, 3),
(50.0, 4),
(48.0, 5),
(30.0, 6), # BW NTSC.
(30.0 / 1.001, 9), # Color NTSC.
(30.0, 6), # BW NTSC, full frame.
(30.0, 7), # Drop frame.
(30.0 / 1.001, 9), # Color NTSC, full frame.
(30.0 / 1.001, 8), # Color NTSC, drop frame.
(25.0, 10),
(24.0, 11),
#(1.0, 12), # 1000 milli/s (use for date time?).
(24.0 / 1.001, 13),
(96.0, 15),
(72.0, 16),
(60.0 / 1.001, 17),
(120.0 / 1.001, 18),
)