From a95c9302c8d0e7c19fd3de603ffe9597317e4754 Mon Sep 17 00:00:00 2001 From: Colin Basnett Date: Wed, 2 Feb 2022 02:18:14 -0800 Subject: [PATCH 1/2] Fixed a bug where the error message that would warn about duplicate root bones would not list the correct bones. --- io_scene_psk_psa/psa/builder.py | 2 +- io_scene_psk_psa/psk/builder.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/io_scene_psk_psa/psa/builder.py b/io_scene_psk_psa/psa/builder.py index 825676a..276d7a9 100644 --- a/io_scene_psk_psa/psa/builder.py +++ b/io_scene_psk_psa/psa/builder.py @@ -54,7 +54,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}') diff --git a/io_scene_psk_psa/psk/builder.py b/io_scene_psk_psa/psk/builder.py index c715f39..44425cc 100644 --- a/io_scene_psk_psa/psk/builder.py +++ b/io_scene_psk_psa/psk/builder.py @@ -91,7 +91,7 @@ class PskBuilder(object): print('root bones') print(root_bones) 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}') From 70fc7d45acefbf6ab2f56f7260683155b80e7c55 Mon Sep 17 00:00:00 2001 From: Colin Basnett Date: Wed, 2 Feb 2022 18:35:39 -0800 Subject: [PATCH 2/2] Minor formatting changes --- io_scene_psk_psa/__init__.py | 4 +++- io_scene_psk_psa/psa/exporter.py | 1 - io_scene_psk_psa/psa/importer.py | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/io_scene_psk_psa/__init__.py b/io_scene_psk_psa/__init__.py index 20cfc8e..3499517 100644 --- a/io_scene_psk_psa/__init__.py +++ b/io_scene_psk_psa/__init__.py @@ -78,8 +78,10 @@ def register(): def unregister(): - del bpy.types.Scene.psa_export del bpy.types.Scene.psa_import + del bpy.types.Scene.psk_import + del bpy.types.Scene.psa_export + del bpy.types.Scene.psk_export bpy.types.TOPBAR_MT_file_export.remove(psk_export_menu_func) bpy.types.TOPBAR_MT_file_import.remove(psk_import_menu_func) bpy.types.TOPBAR_MT_file_export.remove(psa_export_menu_func) diff --git a/io_scene_psk_psa/psa/exporter.py b/io_scene_psk_psa/psa/exporter.py index 6349d2e..546b846 100644 --- a/io_scene_psk_psa/psa/exporter.py +++ b/io_scene_psk_psa/psa/exporter.py @@ -110,7 +110,6 @@ class PsaExportOperator(Operator, ExportHelper): item_layout.enabled = is_bone_filter_mode_item_available(context, identifier) if property_group.bone_filter_mode == 'BONE_GROUPS': - box = layout.box() row = box.row() rows = max(3, min(len(property_group.bone_group_list), 10)) row.template_list('PSX_UL_BoneGroupList', '', property_group, 'bone_group_list', property_group, 'bone_group_list_index', rows=rows) diff --git a/io_scene_psk_psa/psa/importer.py b/io_scene_psk_psa/psa/importer.py index 0c08ecd..7f86078 100644 --- a/io_scene_psk_psa/psa/importer.py +++ b/io_scene_psk_psa/psa/importer.py @@ -249,10 +249,10 @@ class PSA_UL_ImportActionList(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): row = layout.row(align=True) split = row.split(align=True, factor=0.75) - action_col = split.row(align=True) - action_col.alignment = 'LEFT' - action_col.prop(item, 'is_selected', icon_only=True) - action_col.label(text=item.action_name) + column = split.row(align=True) + column.alignment = 'LEFT' + column.prop(item, 'is_selected', icon_only=True) + column.label(text=item.action_name) def draw_filter(self, context, layout): row = layout.row()