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 bugfix/OP-6163_Bug-missing-time-information-on-publishes-from-Tray-Publisher

Browse source
This commit is contained in:
Kayla Man 2023-07-12 11:58:25 +08:00
commit 910e104880
171 changed files with 4073 additions and 2379 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -615,8 +615,8 @@
"maskOverride": false,
"maskDriver": false,
"maskFilter": false,
"maskColor_manager": false,
"maskOperator": false
"maskOperator": false,
"maskColor_manager": false
},
"CreateVrayProxy": {
"enabled": true,

4
openpype/settings/defaults/project_settings/substancepainter.json
View file

@ -2,11 +2,11 @@
"imageio": {
"activate_host_color_management": true,
"ocio_config": {
"override_global_config": true,
"override_global_config": false,
"filepath": []
},
"file_rules": {
"activate_host_rules": true,
"activate_host_rules": false,
"rules": {}
}
},

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

@ -318,52 +318,52 @@
{
"type": "boolean",
"key": "maskOptions",
"label": "Mask Options"
"label": "Export Options"
},
{
"type": "boolean",
"key": "maskCamera",
"label": "Mask Camera"
"label": "Export Cameras"
},
{
"type": "boolean",
"key": "maskLight",
"label": "Mask Light"
"label": "Export Lights"
},
{
"type": "boolean",
"key": "maskShape",
"label": "Mask Shape"
"label": "Export Shapes"
},
{
"type": "boolean",
"key": "maskShader",
"label": "Mask Shader"
"label": "Export Shaders"
},
{
"type": "boolean",
"key": "maskOverride",
"label": "Mask Override"
"label": "Export Override Nodes"
},
{
"type": "boolean",
"key": "maskDriver",
"label": "Mask Driver"
"label": "Export Drivers"
},
{
"type": "boolean",
"key": "maskFilter",
"label": "Mask Filter"
},
{
"type": "boolean",
"key": "maskColor_manager",
"label": "Mask Color Manager"
"label": "Export Filters"
},
{
"type": "boolean",
"key": "maskOperator",
"label": "Mask Operator"
"label": "Export Operators"
},
{
"type": "boolean",
"key": "maskColor_manager",
"label": "Export Color Managers"
}
]
},