+3
-1
@@ -656,7 +656,9 @@ class ArmatureData(Tuple[bool,bool]):
|
|||||||
|
|
||||||
def store_breaking_settings_armature(armature: bpy.types.Object) -> ArmatureData:
|
def store_breaking_settings_armature(armature: bpy.types.Object) -> ArmatureData:
|
||||||
armature_data: bpy.types.Armature = armature.data
|
armature_data: bpy.types.Armature = armature.data
|
||||||
return (armature_data.use_mirror_x, armature.pose.use_mirror_x)
|
data: ArmatureData = (armature_data.use_mirror_x, armature.pose.use_mirror_x)
|
||||||
|
armature_data.use_mirror_x, armature.pose.use_mirror_x = (False, False)
|
||||||
|
return data
|
||||||
|
|
||||||
def restore_breaking_settings_armature(armature: bpy.types.Object, data: ArmatureData) -> None:
|
def restore_breaking_settings_armature(armature: bpy.types.Object, data: ArmatureData) -> None:
|
||||||
# Check if armature object is still valid (not removed)
|
# Check if armature object is still valid (not removed)
|
||||||
|
|||||||
@@ -103,7 +103,6 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator):
|
|||||||
wm.progress_end()
|
wm.progress_end()
|
||||||
|
|
||||||
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:
|
if merge_armature_name_stored in bpy.data.objects:
|
||||||
merge_armature_obj = bpy.data.objects[merge_armature_name_stored]
|
merge_armature_obj = bpy.data.objects[merge_armature_name_stored]
|
||||||
restore_breaking_settings_armature(merge_armature_obj, data_breaking_merge)
|
restore_breaking_settings_armature(merge_armature_obj, data_breaking_merge)
|
||||||
|
|||||||
Reference in New Issue
Block a user