Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into enhancement/OP-5227_3dsmax-render-instance-settings

Browse source
This commit is contained in:
Kayla Man 2023-03-25 21:29:17 +08:00
commit 3d787c3c0b
77 changed files with 2240 additions and 1802 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openpype/settings/defaults/project_anatomy/templates.json
View file

@ -58,12 +58,16 @@
"file": "{originalBasename}.{ext}",
"path": "{@folder}/{@file}"
},
"transient": {
"folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/work/{family}/{subset}"
},
"__dynamic_keys_labels__": {
"maya2unreal": "Maya to Unreal",
"simpleUnrealTextureHero": "Simple Unreal Texture - Hero",
"simpleUnrealTexture": "Simple Unreal Texture",
"online": "online",
"source": "source"
"source": "source",
"transient": "transient"
}
}
}

3
openpype/settings/defaults/project_settings/applications.json Normal file
View file

@ -0,0 +1,3 @@
{
"only_available": false
}

7
openpype/settings/defaults/project_settings/celaction.json
View file

@ -9,6 +9,13 @@
"rules": {}
}
},
"workfile": {
"submission_overrides": [
"render_chunk",
"frame_range",
"resolution"
]
},
"publish": {
"CollectRenderPath": {
"output_extension": "png",

3
openpype/settings/defaults/project_settings/global.json
View file

@ -591,7 +591,8 @@
"task_names": [],
"template_name": "simpleUnrealTextureHero"
}
]
],
"custom_staging_dir_profiles": []
}
},
"project_folder_structure": "{\"__project_root__\": {\"prod\": {}, \"resources\": {\"footage\": {\"plates\": {}, \"offline\": {}}, \"audio\": {}, \"art_dept\": {}}, \"editorial\": {}, \"assets\": {\"characters\": {}, \"locations\": {}}, \"shots\": {}}}",

7
openpype/settings/defaults/project_settings/kitsu.json
View file

@ -7,7 +7,12 @@
"publish": {
"IntegrateKitsuNote": {
"set_status_note": false,
"note_status_shortname": "wfa"
"note_status_shortname": "wfa",
"status_conditions": [],
"custom_comment_template": {
"enabled": false,
"comment_template": "{comment}\n\n| | |\n|--|--|\n| version| `{version}` |\n| family | `{family}` |\n| name | `{name}` |"
}
}
}
}

4
openpype/settings/entities/schemas/projects_schema/schema_main.json
View file

@ -82,6 +82,10 @@
"type": "schema",
"name": "schema_project_slack"
},
{
"type": "schema",
"name": "schema_project_applications"
},
{
"type": "schema",
"name": "schema_project_max"

14
openpype/settings/entities/schemas/projects_schema/schema_project_applications.json Normal file
View file

@ -0,0 +1,14 @@
{
"type": "dict",
"key": "applications",
"label": "Applications",
"collapsible": true,
"is_file": true,
"children": [
{
"type": "boolean",
"key": "only_available",
"label": "Show only available applications"
}
]
}

25
openpype/settings/entities/schemas/projects_schema/schema_project_celaction.json
View file

@ -22,6 +22,31 @@
]
},
{
"type": "dict",
"collapsible": true,
"key": "workfile",
"label": "Workfile",
"children": [
{
"key": "submission_overrides",
"label": "Submission workfile overrides",
"type": "enum",
"multiselection": true,
"enum_items": [
{
"render_chunk": "Pass chunk size"
},
{
"frame_range": "Pass frame range"
},
{
"resolution": "Pass resolution"
}
]
}
]
},
{
"type": "dict",
"collapsible": true,

52
openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json
View file

@ -46,12 +46,62 @@
{
"type": "boolean",
"key": "set_status_note",
"label": "Set status on note"
"label": "Set status with note"
},
{
"type": "text",
"key": "note_status_shortname",
"label": "Note shortname"
},
{
"type": "list",
"key": "status_conditions",
"label": "Status conditions",
"object_type": {
"type": "dict",
"key": "conditions_dict",
"children": [
{
"type": "enum",
"key": "condition",
"label": "Condition",
"enum_items": [
{"equal": "Equal"},
{"not_equal": "Not equal"}
]
},
{
"type": "text",
"key": "short_name",
"label": "Short name"
}
]
},
"label": "Status shortname"
},
{
"type": "dict",
"collapsible": true,
"checkbox_key": "enabled",
"key": "custom_comment_template",
"label": "Custom Comment Template",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "label",
"label": "Kitsu supports markdown and here you can create a custom comment template.<br/>You can use data from your publishing instance's data."
},
{
"key": "comment_template",
"type": "text",
"multiline": true,
"label": "Custom comment"
}
]
}
]
}

65
openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json
View file

@ -408,6 +408,71 @@
}
]
}
},
{
"type": "list",
"key": "custom_staging_dir_profiles",
"label": "Custom Staging Dir Profiles",
"use_label_wrap": true,
"docstring": "Profiles to specify special location and persistence for staging dir. Could be used in Creators and Publish phase!",
"object_type": {
"type": "dict",
"children": [
{
"type": "boolean",
"key": "active",
"label": "Is active",
"default": true
},
{
"type": "separator"
},
{
"key": "hosts",
"label": "Host names",
"type": "hosts-enum",
"multiselection": true
},
{
"key": "task_types",
"label": "Task types",
"type": "task-types-enum"
},
{
"key": "task_names",
"label": "Task names",
"type": "list",
"object_type": "text"
},
{
"key": "families",
"label": "Families",
"type": "list",
"object_type": "text"
},
{
"key": "subsets",
"label": "Subset names",
"type": "list",
"object_type": "text"
},
{
"type": "separator"
},
{
"key": "custom_staging_dir_persistent",
"label": "Custom Staging Folder Persistent",
"type": "boolean",
"default": false
},
{
"key": "template_name",
"label": "Template Name",
"type": "text",
"placeholder": "transient"
}
]
}
}
]
}