From 2b53146e838b144e1bf8c122fc32159d205db01a Mon Sep 17 00:00:00 2001 From: Yusarina Date: Fri, 22 Aug 2025 23:05:05 +0100 Subject: [PATCH 1/3] Armature Meging Fixes - Fixes issue with Armature Merging giving a error. - Fixes logger error --- functions/custom_tools/armature_merging.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/functions/custom_tools/armature_merging.py b/functions/custom_tools/armature_merging.py index 1e2cb95..4d0b5ab 100644 --- a/functions/custom_tools/armature_merging.py +++ b/functions/custom_tools/armature_merging.py @@ -102,12 +102,9 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator): wm.progress_update(100) wm.progress_end() + # Restore settings only for the base armature since merge_armature is removed during join restore_breaking_settings_armature(base_armature, data_breaking_base) - if merge_armature_name_stored in bpy.data.objects: - merge_armature_obj = bpy.data.objects[merge_armature_name_stored] - restore_breaking_settings_armature(merge_armature_obj, data_breaking_merge) - # Restore original mode if it wasn't OBJECT try: if original_mode == 'EDIT_ARMATURE': @@ -126,7 +123,7 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator): except Exception as e: logger.error(f"Error merging armatures: {str(e)}\n{traceback.format_exc()}") - self.report({'ERROR'}, traceback.format_exc()) + self.report({'ERROR'}, f"Error merging armatures: {str(e)}") # Try to restore original mode even on error try: From da2bfeb2fc6dce4d90ba2f54b9b3c2bc300920c1 Mon Sep 17 00:00:00 2001 From: Yusarina Date: Fri, 22 Aug 2025 23:06:27 +0100 Subject: [PATCH 2/3] Version Bump --- blender_manifest.toml | 2 +- resources/translations/en_US.json | 2 +- resources/translations/ja_JP.json | 2 +- resources/translations/ko_KR.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blender_manifest.toml b/blender_manifest.toml index 1dcb437..bfc3c9a 100644 --- a/blender_manifest.toml +++ b/blender_manifest.toml @@ -3,7 +3,7 @@ schema_version = "1.0.0" id = "avatar_toolkit" -version = "0.3.2" +version = "0.3.3" name = "Avatar Toolkit" tagline = "A modern tool for importing and optimizing models for VRChat, Resonite, and other similar games." maintainer = "Team NekoNeo" diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index db2ae94..86fde87 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -1,7 +1,7 @@ { "authors": ["Avatar Toolkit Team"], "messages": { - "AvatarToolkit.label": "Avatar Toolkit (Alpha 0.3.2)", + "AvatarToolkit.label": "Avatar Toolkit (Alpha 0.3.3)", "AvatarToolkit.desc1": "Avatar Toolkit is in Early Access there", "AvatarToolkit.desc2": "will be issues, if you find any issues,", "AvatarToolkit.desc3": "please report it on our Github.", diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index a43e8a1..de621c7 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -1,7 +1,7 @@ { "authors": ["Avatar Toolkit Team"], "messages": { - "AvatarToolkit.label": "アバターツールキット (アルファ 0.3.2)", + "AvatarToolkit.label": "アバターツールキット (アルファ 0.3.3)", "AvatarToolkit.desc1": "アバターツールキットは早期アクセス中であり、", "AvatarToolkit.desc2": "問題が発生する可能性があります。問題を見つけた場合は、", "AvatarToolkit.desc3": "GitHubで報告してください。", diff --git a/resources/translations/ko_KR.json b/resources/translations/ko_KR.json index 2f9ab7f..7840b7e 100644 --- a/resources/translations/ko_KR.json +++ b/resources/translations/ko_KR.json @@ -1,7 +1,7 @@ { "authors": ["Avatar Toolkit Team"], "messages": { - "AvatarToolkit.label": "아바타 툴킷 (알파 0.3.2)", + "AvatarToolkit.label": "아바타 툴킷 (알파 0.3.3)", "AvatarToolkit.desc1": "아바타 툴킷은 초기 액세스 단계에 있으므로", "AvatarToolkit.desc2": "문제가 있을 수 있습니다. 문제를 발견하시면", "AvatarToolkit.desc3": "Github에 보고해 주세요.", From e626bdc5c53ba58cc50ba12a1bd9ea32b090abbf Mon Sep 17 00:00:00 2001 From: Yusarina Date: Sat, 23 Aug 2025 22:36:59 +0100 Subject: [PATCH 3/3] Loggin Fix --- functions/custom_tools/armature_merging.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions/custom_tools/armature_merging.py b/functions/custom_tools/armature_merging.py index 4d0b5ab..072853d 100644 --- a/functions/custom_tools/armature_merging.py +++ b/functions/custom_tools/armature_merging.py @@ -122,8 +122,9 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator): return {'FINISHED'} except Exception as e: - logger.error(f"Error merging armatures: {str(e)}\n{traceback.format_exc()}") - self.report({'ERROR'}, f"Error merging armatures: {str(e)}") + errormessage: str = traceback.format_exc() + logger.error(f"Error merging armatures: {str(e)}\n{errormessage}") + self.report({'ERROR'}, f"Error merging armatures: {errormessage}") # Try to restore original mode even on error try: