Merge branch 'master' into feature-original-sequence-names

# Conflicts: # io_scene_psk_psa/psa/exporter.py
2022-02-02 20:07:10 -08:00
parent 7d749ea30f 70fc7d45ac
commit b58b44cafb
5 changed files with 10 additions and 9 deletions
--- a/io_scene_psk_psa/psa/builder.py
+++ b/io_scene_psk_psa/psa/builder.py
@@ -55,7 +55,7 @@ class PsaBuilder(object):
        # Ensure that the exported hierarchy has a single root bone.
        root_bones = [x for x in bones if x.parent is None]
        if len(root_bones) > 1:
-            root_bone_names = [x.name for x in bones]
+            root_bone_names = [x.name for x in root_bones]
            raise RuntimeError('Exported bone hierarchy must have a single root bone.'
                               f'The bone hierarchy marked for export has {len(root_bones)} root bones: {root_bone_names}')