mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge branch 'develop' into release/3.15.x
# Conflicts: # openpype/hosts/photoshop/plugins/create/create_legacy_image.py
This commit is contained in:
commit
5fbbef5486
80 changed files with 2929 additions and 494 deletions
|
|
@ -288,6 +288,17 @@
|
|||
"task_types": [],
|
||||
"tasks": [],
|
||||
"template_name": "maya2unreal"
|
||||
},
|
||||
{
|
||||
"families": [
|
||||
"online"
|
||||
],
|
||||
"hosts": [
|
||||
"traypublisher"
|
||||
],
|
||||
"task_types": [],
|
||||
"tasks": [],
|
||||
"template_name": "online"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -456,7 +467,8 @@
|
|||
"hosts": [],
|
||||
"task_types": [],
|
||||
"tasks": [],
|
||||
"enabled": true
|
||||
"enabled": true,
|
||||
"use_last_published_workfile": false
|
||||
}
|
||||
],
|
||||
"open_workfile_tool_on_startup": [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue