diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-04 16:45:43 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-04 16:45:43 +0300 |
| commit | 1068cf3057c0a1cd3a60d53722f6d20856eace8a (patch) | |
| tree | 6073c38ee7dd73b64f0d5e10fccc963c1f2a1a85 /io_scene_fbx/import_fbx.py | |
| parent | ae2aee5e3caf2cc372ad9cd643f060bb2b0cb9e9 (diff) | |
FBX import: Fix two stupid errors in recent reaftor, breaking mat idx import.
Diffstat (limited to 'io_scene_fbx/import_fbx.py')
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index ae8d717e..384f1040 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -637,12 +637,14 @@ def blen_read_geom_array_setattr(generator, blen_data, blen_attr, fbx_data, stri for blen_idx, fbx_idx in generator: if fbx_idx == -1: continue - setattr(blen_data[blen_idx], blen_attr, xform(fbx_data[fbx_idx:fbx_idx + item_size])) + setattr(blen_data[blen_idx], blen_attr, + xform(fbx_data[fbx_idx] if (item_size == 1) else fbx_data[fbx_idx:fbx_idx + item_size])) else: for blen_idx, fbx_idx in generator: if fbx_idx == -1: continue - setattr(blen_data[blen_idx], blen_attr, fbx_data[fbx_idx:fbx_idx + item_size]) + setattr(blen_data[blen_idx], blen_attr, + fbx_data[fbx_idx] if (item_size == 1) else fbx_data[fbx_idx:fbx_idx + item_size]) # generic generators. @@ -721,7 +723,7 @@ def blen_read_geom_array_mapped_polygon( xform=None, ): if fbx_layer_mapping == b'ByPolygon': - if fbx_layer_ref == b'IndexToDirect' and fbx_layer_index is not None: + if fbx_layer_ref == b'IndexToDirect': # XXX Looks like we often get no fbx_layer_index in this case, shall not happen but happens... # We fallback to 'Direct' mapping in this case. #~ assert(fbx_layer_index is not None) |