Merge branch 'Current' into Alpha-3
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import traceback
|
||||
import bpy
|
||||
import re
|
||||
from typing import Set, Dict, List, Optional, Tuple
|
||||
@@ -121,6 +122,7 @@ class AvatarToolkit_OT_CombineMaterials(Operator):
|
||||
|
||||
try:
|
||||
num_cleaned = self.clean_material_slots(meshes)
|
||||
|
||||
except Exception:
|
||||
logger.error(f"Material slot cleanup failed: {traceback.format_exc()}")
|
||||
self.report({'ERROR'}, t("Optimization.error.slot_cleanup"))
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import traceback
|
||||
import bpy
|
||||
from typing import Set, List, Tuple, ClassVar
|
||||
from bpy.types import Operator, Context, Object
|
||||
|
||||
@@ -122,7 +122,6 @@ class AvatarToolkit_OT_RemoveDoubles(Operator):
|
||||
except Exception:
|
||||
logger.error(f"Error in execute: {traceback.format_exc()}")
|
||||
return {'CANCELLED'}
|
||||
|
||||
def modal(self, context: Context, event: Event) -> set[ModalReturnType]:
|
||||
"""Modal operator execution"""
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user