From 394d0b3c7f1051654ab1725c87265e78d88f6e75 Mon Sep 17 00:00:00 2001
From: Thomas Barlow <github@mysterymayhem.co.uk>
Date: Thu, 8 Jun 2023 22:12:47 +0100
Subject: [PATCH] Fix #104672: FBX Byte type unsupported

The Byte type "Z" was missing from the supported FBX types, which
would result in an error attempting to parse an FBX containing Byte
properties during import or conversion with fbx2json.

The new variables for the Byte type refer to it as "int8", to reduce the
chance of mixing it up with the existing "bytes" attributes and
functions.

The importer and exporter neither read nor write any Byte properties, so
no changes are made to import or export.
---
 io_scene_fbx/data_types.py | 1 +
 io_scene_fbx/encode_bin.py | 7 +++++++
 io_scene_fbx/fbx2json.py   | 3 +++
 io_scene_fbx/fbx_utils.py  | 4 ++++
 io_scene_fbx/json2fbx.py   | 3 +++
 io_scene_fbx/parse_fbx.py  | 1 +
 6 files changed, 19 insertions(+)

diff --git a/io_scene_fbx/data_types.py b/io_scene_fbx/data_types.py
index 38d3fec4d..cf612b8e6 100644
--- a/io_scene_fbx/data_types.py
+++ b/io_scene_fbx/data_types.py
@@ -4,6 +4,7 @@
 # Script copyright (C) 2013 Blender Foundation
 
 BOOL = b'C'[0]
+INT8 = b'Z'[0]
 INT16 = b'Y'[0]
 INT32 = b'I'[0]
 INT64 = b'L'[0]
diff --git a/io_scene_fbx/encode_bin.py b/io_scene_fbx/encode_bin.py
index 8433134a7..1666c0e43 100644
--- a/io_scene_fbx/encode_bin.py
+++ b/io_scene_fbx/encode_bin.py
@@ -56,6 +56,13 @@ class FBXElem:
         self.props_type.append(data_types.BOOL)
         self.props.append(data)
 
+    def add_int8(self, data):
+        assert(isinstance(data, int))
+        data = pack('<b', data)
+
+        self.props_type.append(data_types.INT8)
+        self.props.append(data)
+
     def add_int16(self, data):
         assert(isinstance(data, int))
         data = pack('<h', data)
diff --git a/io_scene_fbx/fbx2json.py b/io_scene_fbx/fbx2json.py
index 526e61ee0..ad6573b45 100755
--- a/io_scene_fbx/fbx2json.py
+++ b/io_scene_fbx/fbx2json.py
@@ -28,6 +28,7 @@ for each property.
 
 The types are as follows:
 
+* 'Z': - INT8
 * 'Y': - INT16
 * 'C': - BOOL
 * 'I': - INT32
@@ -106,6 +107,7 @@ def unpack_array(read, array_type, array_stride, array_byteswap):
 
 
 read_data_dict = {
+    b'Z'[0]: lambda read: unpack(b'<b', read(1))[0],  # 8 bit int
     b'Y'[0]: lambda read: unpack(b'<h', read(2))[0],  # 16 bit int
     b'C'[0]: lambda read: unpack(b'?', read(1))[0],   # 1 bit bool (yes/no)
     b'I'[0]: lambda read: unpack(b'<i', read(4))[0],  # 32 bit int
@@ -221,6 +223,7 @@ def parse(fn, use_namedtuple=True):
 data_types = type(array)("data_types")
 data_types.__dict__.update(
 dict(
+INT8 = b'Z'[0],
 INT16 = b'Y'[0],
 BOOL = b'C'[0],
 INT32 = b'I'[0],
diff --git a/io_scene_fbx/fbx_utils.py b/io_scene_fbx/fbx_utils.py
index 97cce3942..58a84110c 100644
--- a/io_scene_fbx/fbx_utils.py
+++ b/io_scene_fbx/fbx_utils.py
@@ -722,6 +722,10 @@ def elem_data_single_bool(elem, name, value):
     return _elem_data_single(elem, name, value, "add_bool")
 
 
+def elem_data_single_int8(elem, name, value):
+    return _elem_data_single(elem, name, value, "add_int8")
+
+
 def elem_data_single_int16(elem, name, value):
     return _elem_data_single(elem, name, value, "add_int16")
 
diff --git a/io_scene_fbx/json2fbx.py b/io_scene_fbx/json2fbx.py
index 9712c8bb3..2e55832e1 100755
--- a/io_scene_fbx/json2fbx.py
+++ b/io_scene_fbx/json2fbx.py
@@ -27,6 +27,7 @@ for each property.
 
 The types are as follows:
 
+* 'Z': - INT8
 * 'Y': - INT16
 * 'C': - BOOL
 * 'I': - INT32
@@ -65,6 +66,8 @@ def parse_json_rec(fbx_root, json_node):
     for d, dt in zip(data, data_types):
         if dt == "C":
             e.add_bool(d)
+        elif dt == "Z":
+            e.add_int8(d)
         elif dt == "Y":
             e.add_int16(d)
         elif dt == "I":
diff --git a/io_scene_fbx/parse_fbx.py b/io_scene_fbx/parse_fbx.py
index 96fd81044..fd4868fbe 100644
--- a/io_scene_fbx/parse_fbx.py
+++ b/io_scene_fbx/parse_fbx.py
@@ -67,6 +67,7 @@ def unpack_array(read, array_type, array_stride, array_byteswap):
 
 
 read_data_dict = {
+    b'Z'[0]: lambda read: unpack(b'<b', read(1))[0],  # byte
     b'Y'[0]: lambda read: unpack(b'<h', read(2))[0],  # 16 bit int
     b'C'[0]: lambda read: unpack(b'?', read(1))[0],   # 1 bit bool (yes/no)
     b'I'[0]: lambda read: unpack(b'<i', read(4))[0],  # 32 bit int
-- 
2.30.2