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 feature/OP-3926_gpu-cache

Browse source 
# Conflicts:
#	openpype/settings/defaults/project_settings/maya.json
#	openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
This commit is contained in:
Toke Stuart Jepsen 2023-03-31 16:20:08 +01:00
commit 7fb5242fca
174 changed files with 1566 additions and 794 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
View file

@ -597,7 +597,7 @@
"type": "dict",
"collapsible": true,
"key": "options",
"label": "Burnin formating options",
"label": "Burnin formatting options",
"children": [
{
"type": "number",

14
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
View file

@ -19,12 +19,12 @@
{
"type": "text",
"key": "compression",
"label": "Compression type"
"label": "Encoding"
},
{
"type": "text",
"key": "format",
"label": "Data format"
"label": "Format"
},
{
"type": "number",
@ -48,7 +48,11 @@
"type": "label",
"label": "<b>Display Options</b>"
},
{
"type": "boolean",
"key": "override_display",
"label": "Override display options"
},
{
"type": "color",
"key": "background",
@ -66,8 +70,8 @@
},
{
"type": "boolean",
"key": "override_display",
"label": "Override display options"
"key": "displayGradient",
"label": "Display background gradient"
}
]
},

5
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
View file

@ -21,6 +21,11 @@
"key": "make_tx",
"label": "Make tx files"
},
{
"type": "boolean",
"key": "rs_tex",
"label": "Make Redshift texture files"
},
{
"type": "list",
"key": "defaults",

29
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
View file

@ -997,6 +997,35 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "ExtractLook",
"label": "Extract Look",
"children": [
{
"type": "list",
"key": "maketx_arguments",
"label": "Extra arguments for maketx command line",
"object_type": {
"type": "dict",
"children": [
{
"key": "argument",
"label": "Argument",
"type": "text"
},
{
"key": "parameters",
"label": "Parameters",
"type": "list",
"object_type": "text"
}
]
}
}
]
},
{
"type": "dict",
"collapsible": true,