Merge branch 'Alpha-2' into Amrature-Validation-P2
This commit is contained in:
+13
-2
@@ -49,12 +49,16 @@ def update_shape_intensity(self: PropertyGroup, context: Context) -> None:
|
||||
if self.viseme_preview_mode:
|
||||
VisemePreview.update_preview(context)
|
||||
|
||||
|
||||
def highlight_problem_bones(self: PropertyGroup, context: Context) -> None:
|
||||
"""Updates problem bone highlighting state and saves preference"""
|
||||
logger.info(f"Updating problem bone highlighting to: {self.highlight_problem_bones}")
|
||||
save_preference("highlight_problem_bones", self.highlight_problem_bones)
|
||||
|
||||
def get_mesh_objects(self, context):
|
||||
meshes = [(obj.name, obj.name, "") for obj in bpy.data.objects if obj.type == 'MESH']
|
||||
if not meshes:
|
||||
return [('NONE', t("Visemes.no_meshes"), '')]
|
||||
return meshes
|
||||
|
||||
class AvatarToolkitSceneProperties(PropertyGroup):
|
||||
"""Property group containing Avatar Toolkit scene-level settings and properties"""
|
||||
@@ -142,6 +146,12 @@ class AvatarToolkitSceneProperties(PropertyGroup):
|
||||
items=get_texture_node_list
|
||||
)
|
||||
|
||||
list_only_mode: BoolProperty(
|
||||
name=t("Tools.list_only_mode"),
|
||||
description=t("Tools.list_only_mode_desc"),
|
||||
default=False
|
||||
)
|
||||
|
||||
Material.include_in_atlas = BoolProperty(
|
||||
name=t("TextureAtlas.include_in_atlas"),
|
||||
description=t("TextureAtlas.include_in_atlas_desc"),
|
||||
@@ -283,9 +293,10 @@ class AvatarToolkitSceneProperties(PropertyGroup):
|
||||
description=t("Visemes.mouth_ch_desc")
|
||||
)
|
||||
|
||||
viseme_mesh: StringProperty(
|
||||
viseme_mesh: EnumProperty(
|
||||
name=t("Visemes.mesh_select"),
|
||||
description=t("Visemes.mesh_select_desc"),
|
||||
items=get_mesh_objects
|
||||
)
|
||||
|
||||
shape_intensity: FloatProperty(
|
||||
|
||||
@@ -51,7 +51,7 @@ class AvatarToolkit_OT_ConvertResonite(Operator):
|
||||
armature = get_active_armature(context)
|
||||
if not armature:
|
||||
return False
|
||||
is_valid, _ = validate_armature(armature)
|
||||
is_valid, _, _ = validate_armature(armature)
|
||||
return is_valid
|
||||
|
||||
def execute(self, context: Context) -> Set[str]:
|
||||
|
||||
Reference in New Issue
Block a user