[Bf-extensions-cvs] [b91319ae] master: Fix T98604: FBX import does not handle some framerate codes.

[Bastien Montagne]

Commit: b91319aead96a5f6eaa11728626765dc288e8649
Author: Bastien Montagne
Date:   Mon Jun 13 12:15:39 2022 +0200
Branches: master
https://developer.blender.org/rBAb91319aead96a5f6eaa11728626765dc288e8649

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).

===================================================================

M	io_scene_fbx/__init__.py
M	io_scene_fbx/fbx_utils.py

===================================================================

diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index 02d135b1..f7415a38 100644
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@ -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",
diff --git a/io_scene_fbx/fbx_utils.py b/io_scene_fbx/fbx_utils.py
index 35fdede7..41c63ef8 100644
--- a/io_scene_fbx/fbx_utils.py
+++ b/io_scene_fbx/fbx_utils.py
@@ -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),
 )