Merge branch 'develop' into enhancement/rename_maya_openpype_tools

This commit is contained in:
Kayla Man 2023-12-05 20:10:17 +08:00 committed by GitHub
commit d700e4eb43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 146 additions and 51 deletions

View file

@ -1158,6 +1158,32 @@
}
]
},
"wrap": {
"enabled": true,
"label": "Wrap",
"icon": "{}/app_icons/wrap.png",
"host_name": "wrap",
"environment": "{\n \n}",
"variants": [
{
"name": "2023",
"use_python_2": false,
"executables": {
"windows": [
"c:\\Program Files\\Faceform\\Wrap 2023.10.2\\Wrap.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": "{\n \n}"
}
]
},
"additional_apps": []
}
}

View file

@ -168,6 +168,8 @@ class ApplicationsSettings(BaseSettingsModel):
default_factory=AppGroupWithPython, title="Substance Painter")
unreal: AppGroup = Field(
default_factory=AppGroupWithPython, title="Unreal Editor")
wrap: AppGroup = Field(
default_factory=AppGroupWithPython, title="Wrap")
additional_apps: list[AdditionalAppGroup] = Field(
default_factory=list, title="Additional Applications")

View file

@ -1,31 +1,18 @@
from pydantic import Field
from pathlib import Path
from ayon_server.settings import BaseSettingsModel
class PathsTemplate(BaseSettingsModel):
windows: Path = Field(
'',
title="Windows"
)
darwin: Path = Field(
'',
title="MacOS"
)
linux: Path = Field(
'',
title="Linux"
)
from ayon_server.settings import BaseSettingsModel, MultiplatformPathModel
class CustomBuilderTemplate(BaseSettingsModel):
_layout = "expanded"
task_types: list[str] = Field(
default_factory=list,
title="Task types",
)
template_path: PathsTemplate = Field(
default_factory=PathsTemplate
path: MultiplatformPathModel = Field(
default_factory=MultiplatformPathModel,
title="Template path"
)
@ -37,5 +24,6 @@ class WorkfileBuilderPlugin(BaseSettingsModel):
)
custom_templates: list[CustomBuilderTemplate] = Field(
default_factory=CustomBuilderTemplate
default_factory=CustomBuilderTemplate,
title="Template profiles"
)