Merge branch 'master' into cycles_path_guidingcycles_path_guiding

2 files changed, 3 insertions, 2 deletions

diff --git a/release/scripts/modules/gpu_extras/batch.py b/release/scripts/modules/gpu_extras/batch.py
index ba8e3879a8e..6c9ab52c1a3 100644
--- a/release/scripts/modules/gpu_extras/batch.py
+++ b/release/scripts/modules/gpu_extras/batch.py
@@ -34,13 +34,13 @@ def batch_for_shader(shader, type, content, *, indices=None):
         return 'I32'
 
     def recommended_attr_len(attr_name):
-        item = content[attr_name][0]
         attr_len = 1
         try:
+            item = content[attr_name][0]
             while True:
                 attr_len *= len(item)
                 item = item[0]
-        except TypeError:
+        except (TypeError, IndexError):
             pass
         return attr_len
 
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index 7f6d0b1e9bf..5bd38acb19c 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -184,6 +184,7 @@ def write_sysinfo(filepath):
                 output.write("vendor:\t\t%r\n" % gpu.platform.vendor_get())
                 output.write("version:\t%r\n" % gpu.platform.version_get())
                 output.write("device type:\t%r\n" % gpu.platform.device_type_get())
+                output.write("backend type:\t%r\n" % gpu.platform.backend_type_get())
                 output.write("extensions:\n")
 
                 glext = sorted(gpu.capabilities.extensions_get())