[Bf-extensions-cvs] [7ef9857] master: Fix error in case FBX file specifies no known pre-defined FPS and a null custom fps value...
Bastien Montagne
noreply at git.blender.org
Tue Oct 13 18:03:58 CEST 2015
Commit: 7ef985757de5c40c33bc7dd61dc9e3b7234e601e
Author: Bastien Montagne
Date: Tue Oct 13 18:02:02 2015 +0200
Branches: master
https://developer.blender.org/rBA7ef985757de5c40c33bc7dd61dc9e3b7234e601e
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
===================================================================
M io_scene_fbx/__init__.py
M io_scene_fbx/import_fbx.py
===================================================================
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index 6a40522..b3c05e5 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 0c5b439..3728a82 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
More information about the Bf-extensions-cvs
mailing list