Merge branch 'main' into PoseMode
This commit is contained in:
+10
-10
@@ -1,6 +1,7 @@
|
||||
import bpy
|
||||
from ..core.register import register_wrap
|
||||
from .panel import AvatarToolkitPanel
|
||||
from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
|
||||
from ..core.export_resonite import AvatarToolKit_OT_ExportResonite
|
||||
from bpy.types import Context, Mesh, Panel, Operator
|
||||
from ..functions.translations import t
|
||||
|
||||
@@ -10,15 +11,14 @@ from ..functions.import_anything import ImportAnyModel
|
||||
from ..functions.armature_modifying import AvatarToolkit_OT_StartPoseMode, AvatarToolkit_OT_StopPoseMode, AvatarToolkit_OT_ApplyPoseAsRest, AvatarToolkit_OT_ApplyPoseAsShapekey
|
||||
from ..core.common import get_selected_armature, set_selected_armature, get_all_meshes
|
||||
|
||||
@register_wrap
|
||||
@register_wrap
|
||||
class AvatarToolkitQuickAccessPanel(Panel):
|
||||
bl_label = t("Quick_Access.label")
|
||||
bl_idname = "OBJECT_PT_avatar_toolkit_quick_access"
|
||||
bl_space_type = 'VIEW_3D'
|
||||
bl_region_type = 'UI'
|
||||
bl_category = "Avatar Toolkit"
|
||||
bl_parent_id = "OBJECT_PT_avatar_toolkit"
|
||||
bl_category = CATEGORY_NAME
|
||||
bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
|
||||
bl_order = 1
|
||||
|
||||
def draw(self, context: Context):
|
||||
@@ -36,8 +36,8 @@ class AvatarToolkitQuickAccessPanel(Panel):
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.scale_y = 1.5
|
||||
row.operator(ImportAnyModel.bl_idname, text=t("Quick_Access.import"), icon='IMPORT')
|
||||
row.operator(AVATAR_TOOLKIT_OT_export_menu.bl_idname, text=t("Quick_Access.export"), icon='EXPORT')
|
||||
row.operator(AvatarToolKit_OT_ImportAnyModel.bl_idname, text=t("Quick_Access.import"), icon='IMPORT')
|
||||
row.operator(AVATAR_TOOLKIT_OT_ExportMenu.bl_idname, text=t("Quick_Access.export"), icon='EXPORT')
|
||||
|
||||
if get_selected_armature(context) != None:
|
||||
if(context.mode == "POSE"):
|
||||
@@ -52,7 +52,7 @@ class AvatarToolkitQuickAccessPanel(Panel):
|
||||
row.operator(AvatarToolkit_OT_StartPoseMode.bl_idname, text=t("Quick_Access.start_pose_mode.label"), icon='POSE_HLT')
|
||||
|
||||
@register_wrap
|
||||
class AVATAR_TOOLKIT_OT_export_menu(Operator):
|
||||
class AVATAR_TOOLKIT_OT_ExportMenu(bpy.types.Operator):
|
||||
bl_idname = "avatar_toolkit.export_menu"
|
||||
bl_label = t("Quick_Access.export_menu.label")
|
||||
bl_description = t("Quick_Access.export_menu.desc")
|
||||
@@ -71,11 +71,11 @@ class AVATAR_TOOLKIT_OT_export_menu(Operator):
|
||||
def draw(self, context: Context):
|
||||
layout = self.layout
|
||||
layout.label(text=t("Quick_Access.select_export.label"), icon='EXPORT')
|
||||
layout.operator("avatar_toolkit.export_resonite", text=t("Quick_Access.select_export_resonite.label"), icon='SCENE_DATA')
|
||||
layout.operator("avatar_toolkit.export_fbx", text=t("Quick_Access.export_fbx.label"), icon='OBJECT_DATA')
|
||||
layout.operator(AvatarToolKit_OT_ExportResonite.bl_idname, text=t("Quick_Access.select_export_resonite.label"), icon='SCENE_DATA')
|
||||
layout.operator(AVATAR_TOOLKIT_OT_ExportFbx.bl_idname, text=t("Quick_Access.export_fbx.label"), icon='OBJECT_DATA')
|
||||
|
||||
@register_wrap
|
||||
class AVATAR_TOOLKIT_OT_export_fbx(Operator):
|
||||
class AVATAR_TOOLKIT_OT_ExportFbx(bpy.types.Operator):
|
||||
bl_idname = 'avatar_toolkit.export_fbx'
|
||||
bl_label = t("Quick_Access.export_fbx.label")
|
||||
bl_description = t("Quick_Access.export_fbx.desc")
|
||||
|
||||
Reference in New Issue
Block a user