diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-03 17:54:26 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-03 17:54:26 +0300 |
| commit | 7937fe22df4a5fcfa931281aba1dfa05bb0ea4a1 (patch) | |
| tree | b902b01d579f5fbff6ae47cd02bc039a702875d1 /io_scene_fbx | |
| parent | 318e225c69f2a6c492b28ea7586e99c70a65b079 (diff) | |
Fix T45291: empty bytes/string nodes seems to be valid... *sigh*
Diffstat (limited to 'io_scene_fbx')
| -rw-r--r-- | io_scene_fbx/__init__.py | 2 | ||||
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 4d5b32b1..42321cf1 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": (3, 4, 1), + "version": (3, 4, 2), "blender": (2, 74, 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 eed332af..5d292b1e 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -76,7 +76,7 @@ def elem_find_iter(elem, id_search): def elem_find_first_string(elem, id_search): fbx_item = elem_find_first(elem, id_search) - if fbx_item is not None: + if fbx_item is not None and fbx_item.props: # Do not error on complete empty properties (see T45291). assert(len(fbx_item.props) == 1) assert(fbx_item.props_type[0] == data_types.STRING) return fbx_item.props[0].decode('utf-8') @@ -85,7 +85,7 @@ def elem_find_first_string(elem, id_search): def elem_find_first_string_as_bytes(elem, id_search): fbx_item = elem_find_first(elem, id_search) - if fbx_item is not None: + if fbx_item is not None and fbx_item.props: # Do not error on complete empty properties (see T45291). assert(len(fbx_item.props) == 1) assert(fbx_item.props_type[0] == data_types.STRING) return fbx_item.props[0] # Keep it as bytes as requested... @@ -94,7 +94,7 @@ def elem_find_first_string_as_bytes(elem, id_search): def elem_find_first_bytes(elem, id_search, decode=True): fbx_item = elem_find_first(elem, id_search) - if fbx_item is not None: + if fbx_item is not None and fbx_item.props: # Do not error on complete empty properties (see T45291). assert(len(fbx_item.props) == 1) assert(fbx_item.props_type[0] == data_types.BYTES) return fbx_item.props[0] |