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 feature/resolve_open_last_workfile

Browse source
This commit is contained in:
Jakub Ježek 2023-06-01 16:56:05 +02:00 • committed by GitHub
commit 4cd2291bf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 1882 additions and 583 deletions
Download patch file Download diff file Expand all files Collapse all files

5
openpype/settings/defaults/project_settings/blender.json
View file

@ -1,4 +1,9 @@
{
"unit_scale_settings": {
"enabled": true,
"apply_on_opening": false,
"base_file_unit_scale": 0.01
},
"imageio": {
"ocio_config": {
"enabled": false,

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

@ -46,6 +46,10 @@
"enabled": false,
"families": []
},
"CollectFramesFixDef": {
"enabled": true,
"rewrite_version_enable": true
},
"ValidateEditorialAssetName": {
"enabled": true,
"optional": false
@ -252,7 +256,9 @@
}
},
{
"families": ["review"],
"families": [
"review"
],
"hosts": [
"maya",
"houdini"

2
openpype/settings/defaults/project_settings/unreal.json
View file

@ -15,6 +15,6 @@
"preroll_frames": 0,
"render_format": "png",
"project_setup": {
"dev_mode": true
"dev_mode": false
}
}

26
openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
View file

@ -5,6 +5,32 @@
"label": "Blender",
"is_file": true,
"children": [
{
"key": "unit_scale_settings",
"type": "dict",
"label": "Set Unit Scale",
"collapsible": true,
"is_group": true,
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"key": "apply_on_opening",
"type": "boolean",
"label": "Apply on Opening Existing Files"
},
{
"key": "base_file_unit_scale",
"type": "number",
"label": "Base File Unit Scale",
"decimal": 10
}
]
},
{
"key": "imageio",
"type": "dict",

20
openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
View file

@ -81,6 +81,26 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"checkbox_key": "enabled",
"key": "CollectFramesFixDef",
"label": "Collect Frames to Fix",
"is_group": true,
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "boolean",
"key": "rewrite_version_enable",
"label": "Show 'Rewrite latest version' toggle"
}
]
},
{
"type": "dict",
"collapsible": true,