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

Merge branch 'develop' into bugfix/extract_oiio_transcode_apply_scene_display_view

Browse source
This commit is contained in:
Jakub Trllo 2025-12-01 12:39:25 +01:00 • committed by GitHub
commit f1cbd3436a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

1
server/settings/conversion.py
View file

@ -164,5 +164,6 @@ def convert_settings_overrides(
) -> dict[str, Any]:
_convert_imageio_configs_0_3_1(overrides)
_convert_imageio_configs_0_4_5(overrides)
_convert_imageio_configs_1_6_5(overrides)
_convert_publish_plugins(overrides)
return overrides

1
server/settings/main.py
View file

@ -59,6 +59,7 @@ def _ocio_config_profile_types():
{"value": "builtin_path", "label": "AYON built-in OCIO config"},
{"value": "custom_path", "label": "Path to OCIO config"},
{"value": "published_product", "label": "Published product"},
{"value": "disabled", "label": "Disable OCIO management"},
]