diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-04 16:44:45 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-04 16:44:45 +0300 |
commit | 80e4d25bfb79b07f38f32818885d6c5886e5e7dd (patch) | |
tree | adfed9166d9344b39f388380ce2b41037d51979f | |
parent | 629132f1e75a927cb926248397e6e234b3936582 (diff) |
Minor import fixes (wrong string/bytes prop handling, previous fix re meshes was a bit too aggressive, forgot lamps, cameras & co).
-rw-r--r-- | io_scene_fbx/export_fbx_bin.py | 2 | ||||
-rw-r--r-- | io_scene_fbx/import_fbx.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py index c7f004a3..31402420 100644 --- a/io_scene_fbx/export_fbx_bin.py +++ b/io_scene_fbx/export_fbx_bin.py @@ -2612,7 +2612,7 @@ def fbx_definitions_elements(root, scene_data): def fbx_objects_elements(root, scene_data): """ - Data (objects, geometry, material, textures, armatures, etc. + Data (objects, geometry, material, textures, armatures, etc.). """ objects = elem_empty(root, b"Objects") diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index 07652cfb..93e8fdeb 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -85,7 +85,7 @@ def elem_find_first_bytes(elem, id_search, decode=True): fbx_item = elem_find_first(elem, id_search) if fbx_item is not None: assert(len(fbx_item.props) == 1) - assert(fbx_item.props_type[0] == data_types.STRING) + assert(fbx_item.props_type[0] == data_types.BYTES) return fbx_item.props[0] return None @@ -677,8 +677,8 @@ def blen_read_animations(fbx_tmpl_astack, fbx_tmpl_alayer, stacks, scene): def blen_read_geom_layerinfo(fbx_layer): return ( elem_find_first_string(fbx_layer, b'Name'), - elem_find_first_bytes(fbx_layer, b'MappingInformationType'), - elem_find_first_bytes(fbx_layer, b'ReferenceInformationType'), + elem_find_first_string(fbx_layer, b'MappingInformationType'), + elem_find_first_string(fbx_layer, b'ReferenceInformationType'), ) @@ -2244,7 +2244,7 @@ def load(operator, context, filepath="", fbx_sdata, bl_data = p_item = fbx_table_nodes.get(c_src, (None, None)) if fbx_sdata is None: continue - if fbx_sdata.id != b'Geometry': + if fbx_sdata.id not in {b'Geometry', b'NodeAttribute'}: continue parent.bl_data = bl_data else: |