Merge branch 'main' into Texture-Atlasing

This commit is contained in:
Onan Chew
2024-07-24 20:49:25 -04:00
committed by GitHub
6 changed files with 295 additions and 18 deletions
+43 -6
View File
@@ -1,13 +1,13 @@
import bpy
from ..functions.translations import t, get_languages_list, update_ui
from ..functions.translations import t, get_languages_list, update_language
from ..core.register import register_property
from bpy.types import Scene, Object, Material, TextureNode, Context, SceneObjects, PropertyGroup
from bpy.props import BoolProperty, EnumProperty, FloatProperty, IntProperty, CollectionProperty, StringProperty, FloatVectorProperty, PointerProperty
from bpy.utils import register_class
from ..core.register import register_wrap
from ..core.addon_preferences import get_preference
from ..core.common import SceneMatClass, material_list_bool, get_armatures
from ..core.common import SceneMatClass, material_list_bool, get_armatures, get_mesh_items
@@ -21,9 +21,35 @@ def register() -> None:
default=default_language,
update=update_language
)
bpy.types.Scene.selected_mesh = bpy.props.EnumProperty(
items=get_mesh_items,
name="Selected Mesh",
description="The currently selected mesh for viseme operations"
)
bpy.types.Scene.avatar_toolkit_language_changed = bpy.props.BoolProperty(default=False)
bpy.types.Scene.mouth_a = bpy.props.StringProperty(
name=t("Scene.mouth_a.label"),
description=t("Scene.mouth_a.desc")
)
bpy.types.Scene.mouth_o = bpy.props.StringProperty(
name=t("Scene.mouth_o.label"),
description=t("Scene.mouth_o.desc")
)
bpy.types.Scene.mouth_ch = bpy.props.StringProperty(
name=t("Scene.mouth_ch.label"),
description=t("Scene.mouth_ch.desc")
)
bpy.types.Scene.shape_intensity = bpy.props.FloatProperty(
name=t("Scene.shape_intensity.label"),
description=t("Scene.shape_intensity.desc"),
default=1.0,
min=0.0,
max=2.0
)
bpy.types.Scene.selected_armature = bpy.props.EnumProperty(
items=get_armatures,
name="Selected Armature",
@@ -55,13 +81,24 @@ def register() -> None:
register_property((Scene, "texture_atlas_Has_Mat_List_Shown", BoolProperty(default=False, get=material_list_bool.get_bool, set=material_list_bool.set_bool)))
def unregister():
def unregister() -> None:
if hasattr(bpy.types.Scene, "avatar_toolkit_language"):
del bpy.types.Scene.avatar_toolkit_language
if hasattr(bpy.types.Scene, "avatar_toolkit_language_changed"):
del bpy.types.Scene.avatar_toolkit_language_changed
if hasattr(bpy.types.Scene, "mouth_a"):
del bpy.types.Scene.mouth_a
if hasattr(bpy.types.Scene, "mouth_o"):
del bpy.types.Scene.mouth_o
if hasattr(bpy.types.Scene, "mouth_ch"):
del bpy.types.Scene.mouth_ch
if hasattr(bpy.types.Scene, "shape_intensity"):
del bpy.types.Scene.shape_intensity
if hasattr(bpy.types.Scene, "selected_armature"):
del bpy.types.Scene.selected_armature