[Bf-extensions-cvs] [1068cf3] master: FBX import: Fix two stupid errors in recent reaftor, breaking mat idx import.

[Bastien Montagne]

Commit: 1068cf3057c0a1cd3a60d53722f6d20856eace8a
Author: Bastien Montagne
Date:   Sun Jan 4 14:45:43 2015 +0100
Branches: master
https://developer.blender.org/rBA1068cf3057c0a1cd3a60d53722f6d20856eace8a

FBX import: Fix two stupid errors in recent reaftor, breaking mat idx import.

===================================================================

M	io_scene_fbx/import_fbx.py

===================================================================

diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index ae8d717..384f104 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)