Merge branch 'develop' into feature/1159-maya-safer-handling-of-expected-render-output-names

This commit is contained in:
Milan Kolar 2021-05-17 13:32:27 +02:00 committed by GitHub
commit 19b97780dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 1624 additions and 639 deletions

View file

@ -0,0 +1,18 @@
{
"publish": {
"ValidateSceneSettings": {
"enabled": true,
"optional": true,
"active": true,
"skip_resolution_check": [".*"],
"skip_timelines_check": [".*"]
},
"AfterEffectsSubmitDeadline": {
"use_published": true,
"priority": 50,
"primary_pool": "",
"secondary_pool": "",
"chunk_size": 1000000
}
}
}

View file

@ -267,13 +267,6 @@
"remote_site": "studio"
},
"sites": {
"gdrive": {
"provider": "gdrive",
"credentials_url": "",
"root": {
"work": ""
}
}
}
},
"project_plugins": {

View file

@ -1,14 +1,18 @@
{
"general": {
"skip_resolution_check": [],
"skip_timelines_check": []
},
"publish": {
"CollectPalettes": {
"allowed_tasks": [
"."
".*"
]
},
"ValidateSceneSettings": {
"enabled": true,
"optional": true,
"active": true,
"frame_check_filter": [],
"skip_resolution_check": [],
"skip_timelines_check": []
},
"HarmonySubmitDeadline": {
"use_published": false,
"priority": 50,

View file

@ -135,7 +135,8 @@
"workspace_name": ""
},
"sync_server": {
"enabled": false
"enabled": false,
"sites": {}
},
"deadline": {
"enabled": true,