Merge branch 'master' into xr-dev

1 files changed, 9 insertions, 3 deletions

diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index 5fabec24..90f0c016 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -778,16 +778,22 @@ def blen_read_geom_layerinfo(fbx_layer):
 
 def blen_read_geom_array_setattr(generator, blen_data, blen_attr, fbx_data, stride, item_size, descr, xform):
     """Generic fbx_layer to blen_data setter, generator is expected to yield tuples (ble_idx, fbx_idx)."""
-    max_idx = len(blen_data) - 1
+    max_blen_idx = len(blen_data) - 1
+    max_fbx_idx = len(fbx_data) - 1
     print_error = True
 
     def check_skip(blen_idx, fbx_idx):
         nonlocal print_error
         if fbx_idx < 0:  # Negative values mean 'skip'.
             return True
-        if blen_idx > max_idx:
+        if blen_idx > max_blen_idx:
             if print_error:
-                print("ERROR: too much data in this layer, compared to elements in mesh, skipping!")
+                print("ERROR: too much data in this Blender layer, compared to elements in mesh, skipping!")
+                print_error = False
+            return True
+        if fbx_idx + item_size - 1 > max_fbx_idx:
+            if print_error:
+                print("ERROR: not enough data in this FBX layer, skipping!")
                 print_error = False
             return True
         return False