Merge branch 'develop' of github.com:pypeclub/pype into feature/sync_server_settings_changes

This commit is contained in:
Petr Kalis 2021-05-10 13:32:06 +02:00
commit c039d7fe5d
15 changed files with 179 additions and 124 deletions

View file

@ -11,7 +11,7 @@
"path": "{@folder}/{@file}"
},
"render": {
"folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/render/{subset}/{@version}",
"folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}",
"file": "{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{ext}",
"path": "{@folder}/{@file}"
},

View file

@ -1,7 +1,18 @@
{
"publish": {
"IntegrateHeroVersion": {
"enabled": true
"enabled": true,
"optional": true,
"families": [
"model",
"rig",
"look",
"pointcache",
"animation",
"setdress",
"layout",
"mayaAscii"
]
},
"ExtractJpegEXR": {
"enabled": true,
@ -116,19 +127,22 @@
]
},
"IntegrateAssetNew": {
"template_name_profiles": {
"publish": {
"template_name_profiles": [
{
"families": [],
"tasks": []
"tasks": [],
"template_name": "publish"
},
"render": {
{
"families": [
"review",
"render",
"prerender"
]
],
"tasks": [],
"template_name": "render"
}
},
],
"subset_grouping_profiles": [
{
"families": [],

View file

@ -16,6 +16,17 @@
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "boolean",
"key": "optional",
"label": "Optional"
},
{
"key": "families",
"label": "Families",
"type": "list",
"object_type": "text"
}
]
},
@ -420,9 +431,39 @@
"is_group": true,
"children": [
{
"type": "raw-json",
"type": "list",
"key": "template_name_profiles",
"label": "template_name_profiles"
"label": "Template name profiles",
"use_label_wrap": true,
"object_type": {
"type": "dict",
"children": [
{
"type": "label",
"label": ""
},
{
"key": "families",
"label": "Families",
"type": "list",
"object_type": "text"
},
{
"key": "tasks",
"label": "Task names",
"type": "list",
"object_type": "text"
},
{
"type": "separator"
},
{
"type": "text",
"key": "template_name",
"label": "Template name"
}
]
}
},
{
"type": "list",