Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into enhancement/OP-5808_Enhancement-3dsmax-rendering-time-data-from-instance

Browse source
This commit is contained in:
Kayla Man 2023-05-08 17:33:16 +08:00
commit 8a602b51c7
86 changed files with 4047 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openpype/settings/defaults/project_settings/aftereffects.json
View file

@ -13,10 +13,14 @@
"RenderCreator": {
"defaults": [
"Main"
]
],
"mark_for_review": true
}
},
"publish": {
"CollectReview": {
"enabled": true
},
"ValidateSceneSettings": {
"enabled": true,
"optional": true,

3
openpype/settings/defaults/project_settings/maya.json
View file

@ -1460,7 +1460,8 @@
},
"reference_loader": {
"namespace": "{asset_name}_{subset}_##_",
"group_name": "_GRP"
"group_name": "_GRP",
"display_handle": true
}
},
"workfile_build": {

13
openpype/settings/defaults/project_settings/substancepainter.json Normal file
View file

@ -0,0 +1,13 @@
{
"imageio": {
"ocio_config": {
"enabled": true,
"filepath": []
},
"file_rules": {
"enabled": true,
"rules": {}
}
},
"shelves": {}
}

27
openpype/settings/defaults/system_settings/applications.json
View file

@ -1479,6 +1479,33 @@
}
}
},
"substancepainter": {
"enabled": true,
"label": "Substance Painter",
"icon": "app_icons/substancepainter.png",
"host_name": "substancepainter",
"environment": {},
"variants": {
"8-2-0": {
"executables": {
"windows": [
"C:\\Program Files\\Adobe\\Adobe Substance 3D Painter\\Adobe Substance 3D Painter.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"__dynamic_keys_labels__": {
"8-2-0": "8.2.0"
}
}
},
"unreal": {
"enabled": true,
"label": "Unreal Editor",

1
openpype/settings/entities/enum_entity.py
View file

@ -168,6 +168,7 @@ class HostsEnumEntity(BaseEnumEntity):
"tvpaint",
"unreal",
"standalonepublisher",
"substancepainter",
"traypublisher",
"webpublisher"
]

4
openpype/settings/entities/schemas/projects_schema/schema_main.json
View file

@ -122,6 +122,10 @@
"type": "schema",
"name": "schema_project_photoshop"
},
{
"type": "schema",
"name": "schema_project_substancepainter"
},
{
"type": "schema",
"name": "schema_project_harmony"

23
openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
View file

@ -40,7 +40,13 @@
"label": "Default Variants",
"object_type": "text",
"docstring": "Fill default variant(s) (like 'Main' or 'Default') used in subset name creation."
}
},
{
"type": "boolean",
"key": "mark_for_review",
"label": "Review",
"default": true
}
]
}
]
@ -51,6 +57,21 @@
"key": "publish",
"label": "Publish plugins",
"children": [
{
"type": "dict",
"collapsible": true,
"key": "CollectReview",
"label": "Collect Review",
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled",
"default": true
}
]
},
{
"type": "dict",
"collapsible": true,

35
openpype/settings/entities/schemas/projects_schema/schema_project_substancepainter.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "dict",
"collapsible": true,
"key": "substancepainter",
"label": "Substance Painter",
"is_file": true,
"children": [
{
"key": "imageio",
"type": "dict",
"label": "Color Management (ImageIO)",
"is_group": true,
"children": [
{
"type": "schema",
"name": "schema_imageio_config"
},
{
"type": "schema",
"name": "schema_imageio_file_rules"
}
]
},
{
"type": "dict-modifiable",
"key": "shelves",
"label": "Shelves",
"use_label_wrap": true,
"object_type": {
"type": "text"
}
}
]
}

8
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json
View file

@ -111,6 +111,14 @@
{
"type": "label",
"label": "Here's a link to the doc where you can find explanations about customing the naming of referenced assets: https://openpype.io/docs/admin_hosts_maya#load-plugins"
},
{
"type": "separator"
},
{
"type": "boolean",
"key": "display_handle",
"label": "Display Handle On Load References"
}
]
}

40
openpype/settings/entities/schemas/system_schema/host_settings/schema_substancepainter.json Normal file
View file

@ -0,0 +1,40 @@
{
"type": "dict",
"key": "substancepainter",
"label": "Substance Painter",
"collapsible": true,
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "schema_template",
"name": "template_host_unchangables"
},
{
"key": "environment",
"label": "Environment",
"type": "raw-json"
},
{
"type": "dict-modifiable",
"key": "variants",
"collapsible_key": true,
"use_label_wrap": false,
"object_type": {
"type": "dict",
"collapsible": true,
"children": [
{
"type": "schema_template",
"name": "template_host_variant_items",
"skip_paths": ["use_python_2"]
}
]
}
}
]
}

4
openpype/settings/entities/schemas/system_schema/schema_applications.json
View file

@ -93,6 +93,10 @@
"type": "schema",
"name": "schema_celaction"
},
{
"type": "schema",
"name": "schema_substancepainter"
},
{
"type": "schema",
"name": "schema_unreal"