Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-01-24 20:25:32 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-01-24 20:25:32 +0300
commit674dcd70ceb82a43a4c52a0ac4445b0c14ab31ef (patch)
tree45c74a821603d4759a9f2edb8a7318400e1f19d6 /io_scene_fbx
parent28324e0fb6748b323f6a5fa031ee4e126998c223 (diff)
Fix T51140: FBX import fails to read file exported from Max.
Usual crap with PoS of FBX... feeling bad though, that report skipped out of my radar for too long. :|
Diffstat (limited to 'io_scene_fbx')
-rw-r--r--io_scene_fbx/__init__.py2
-rw-r--r--io_scene_fbx/import_fbx.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index e677e25c..77596c8a 100644
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@ -21,7 +21,7 @@
bl_info = {
"name": "FBX format",
"author": "Campbell Barton, Bastien Montagne, Jens Restemeier",
- "version": (4, 14, 1),
+ "version": (4, 14, 2),
"blender": (2, 80, 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/import_fbx.py b/io_scene_fbx/import_fbx.py
index c186d3ab..5a3287a2 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -252,9 +252,9 @@ def elem_props_get_bool(elem, elem_prop_id, default=None):
elem_prop = elem_props_find_first(elem, elem_prop_id)
if elem_prop is not None:
assert(elem_prop.props[0] == elem_prop_id)
- assert(elem_prop.props[1] == b'bool')
+ # b'Bool' with a capital seems to be used for animated property... go figure...
+ assert(elem_prop.props[1] in {b'bool', b'Bool'})
assert(elem_prop.props[2] == b'')
- assert(elem_prop.props[3] == b'')
# we could allow other number types
assert(elem_prop.props_type[4] == data_types.INT32)