diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-13 19:02:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-13 19:02:02 +0300 |
| commit | 7ef985757de5c40c33bc7dd61dc9e3b7234e601e (patch) | |
| tree | ff2b5a1369beaa1b76384ff71a4a94f025785139 | |
| parent | ecdc7c03ec14e6ed70dea808b61049017f46ad97 (diff) | |
Fix error in case FBX file specifies no known pre-defined FPS and a null custom fps value...
Patch by Julian (joolsa).
Differential Revision: https://developer.blender.org/D1551
| -rw-r--r-- | io_scene_fbx/__init__.py | 4 | ||||
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 6a40522f..b3c05e50 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,8 +21,8 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (3, 6, 2), - "blender": (2, 74, 0), + "version": (3, 6, 3), + "blender": (2, 76, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", "warning": "", diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index 0c5b4398..3728a822 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -2315,7 +2315,7 @@ def load(operator, context, filepath="", custom_fps = elem_props_get_number(fbx_settings_props, b'CustomFrameRate', 25.0) time_mode = elem_props_get_enum(fbx_settings_props, b'TimeMode') real_fps = {eid: val for val, eid in FBX_FRAMERATES[1:]}.get(time_mode, custom_fps) - if real_fps < 0.0: + if real_fps <= 0.0: real_fps = 25.0 scene.render.fps = round(real_fps) scene.render.fps_base = scene.render.fps / real_fps |