Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into enhancement/launcher_action_to_create_folder_structure

Browse source
This commit is contained in:
Roy Nieterau 2025-02-18 17:01:19 +01:00 • committed by GitHub
commit f0cdeca61d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
171 changed files with 13314 additions and 4977 deletions
Download patch file Download diff file Expand all files Collapse all files

35
server/settings/publish_plugins.py
View file

@ -358,7 +358,10 @@ class ExtractOIIOTranscodeOutputModel(BaseSettingsModel):
custom_tags: list[str] = SettingsField(
default_factory=list,
title="Custom Tags",
description="Additional custom tags that will be added to the created representation."
description=(
"Additional custom tags that will be added"
" to the created representation."
)
)
@ -459,8 +462,8 @@ class ExtractReviewFilterModel(BaseSettingsModel):
single_frame_filter: str = SettingsField(
"everytime", # codespell:ignore everytime
description=(
"Use output <b>always</b> / only if input <b>is 1 frame</b>"
" image / only if has <b>2+ frames</b> or <b>is video</b>"
"Use output **always** / only if input **is 1 frame**"
" image / only if has **2+ frames** or **is video**"
),
enum_resolver=extract_review_filter_enum
)
@ -892,9 +895,11 @@ class PublishPuginsModel(BaseSettingsModel):
default_factory=CollectFramesFixDefModel,
title="Collect Frames to Fix",
)
CollectUSDLayerContributions: CollectUSDLayerContributionsModel = SettingsField(
default_factory=CollectUSDLayerContributionsModel,
title="Collect USD Layer Contributions",
CollectUSDLayerContributions: CollectUSDLayerContributionsModel = (
SettingsField(
default_factory=CollectUSDLayerContributionsModel,
title="Collect USD Layer Contributions",
)
)
ValidateEditorialAssetName: ValidateBaseModel = SettingsField(
default_factory=ValidateBaseModel,
@ -1003,8 +1008,8 @@ DEFAULT_PUBLISH_VALUES = {
{"name": "model", "order": 100},
{"name": "assembly", "order": 150},
{"name": "groom", "order": 175},
{"name": "look", "order": 300},
{"name": "rig", "order": 100},
{"name": "look", "order": 200},
{"name": "rig", "order": 300},
# Shot layers
{"name": "layout", "order": 200},
{"name": "animation", "order": 300},
@ -1028,7 +1033,8 @@ DEFAULT_PUBLISH_VALUES = {
"maya",
"nuke",
"photoshop",
"substancepainter"
"substancepainter",
"silhouette",
],
"enabled": True,
"optional": False,
@ -1048,7 +1054,8 @@ DEFAULT_PUBLISH_VALUES = {
"harmony",
"photoshop",
"aftereffects",
"fusion"
"fusion",
"silhouette",
],
"enabled": True,
"optional": True,
@ -1214,7 +1221,9 @@ DEFAULT_PUBLISH_VALUES = {
"TOP_RIGHT": "{anatomy[version]}",
"BOTTOM_LEFT": "{username}",
"BOTTOM_CENTERED": "{folder[name]}",
"BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}",
"BOTTOM_RIGHT": (
"{frame_start}-{current_frame}-{frame_end}"
),
"filter": {
"families": [],
"tags": []
@ -1240,7 +1249,9 @@ DEFAULT_PUBLISH_VALUES = {
"TOP_RIGHT": "{anatomy[version]}",
"BOTTOM_LEFT": "{username}",
"BOTTOM_CENTERED": "{folder[name]}",
"BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}",
"BOTTOM_RIGHT": (
"{frame_start}-{current_frame}-{frame_end}"
),
"filter": {
"families": [],
"tags": []

43
server/settings/tools.py
View file

@ -83,8 +83,8 @@ class CreatorToolModel(BaseSettingsModel):
filter_creator_profiles: list[FilterCreatorProfile] = SettingsField(
default_factory=list,
title="Filter creator profiles",
description="Allowed list of creator labels that will be only shown if "
"profile matches context."
description="Allowed list of creator labels that will be only shown"
" if profile matches context."
)
@validator("product_types_smart_select")
@ -426,7 +426,9 @@ DEFAULT_TOOLS_VALUES = {
],
"task_types": [],
"tasks": [],
"template": "{product[type]}{Task[name]}_{Renderlayer}_{Renderpass}"
"template": (
"{product[type]}{Task[name]}_{Renderlayer}_{Renderpass}"
)
},
{
"product_types": [
@ -482,6 +484,17 @@ DEFAULT_TOOLS_VALUES = {
"task_types": [],
"tasks": [],
"template": "{folder[name]}_{variant}"
},
{
"product_types": [
"textureSet"
],
"hosts": [
"substancedesigner"
],
"task_types": [],
"tasks": [],
"template": "T_{folder[name]}{variant}"
}
],
"filter_creator_profiles": []
@ -555,6 +568,18 @@ DEFAULT_TOOLS_VALUES = {
"task_names": [],
"template_name": "simpleUnrealTexture"
},
{
"product_types": [
"image",
"textures",
],
"hosts": [
"substancedesigner"
],
"task_types": [],
"task_names": [],
"template_name": "simpleUnrealTexture"
},
{
"product_types": [
"staticMesh",
@ -601,6 +626,18 @@ DEFAULT_TOOLS_VALUES = {
"task_types": [],
"task_names": [],
"template_name": "simpleUnrealTextureHero"
},
{
"product_types": [
"image",
"textures"
],
"hosts": [
"substancedesigner"
],
"task_types": [],
"task_names": [],
"template_name": "simpleUnrealTextureHero"
}
]
}