snipeslow/Avatar-Toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Armature Meging Fixes

Browse Source 
- Fixes issue with Armature Merging giving a error.
- Fixes logger error
This commit is contained in:
Yusarina
2025-08-22 23:05:05 +01:00
parent 4ba594d712
commit 2b53146e83
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/custom_tools/armature_merging.py
+2 -5
View File
@@ -102,12 +102,9 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator):
wm.progress_update(100) wm.progress_update(100)
wm.progress_end() 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) 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 # Restore original mode if it wasn't OBJECT
try: try:
if original_mode == 'EDIT_ARMATURE': if original_mode == 'EDIT_ARMATURE':
@@ -126,7 +123,7 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator):
except Exception as e: except Exception as e:
logger.error(f"Error merging armatures: {str(e)}\n{traceback.format_exc()}") 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 to restore original mode even on error
try: try: