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 enhancement/YN-0130_copy_folder_thumbnail

Browse source
This commit is contained in:
Jakub Trllo 2025-10-29 16:29:28 +01:00 • committed by GitHub
commit 842c25a762
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/ayon_core/addon/base.py
View file

@ -141,6 +141,9 @@ def _get_ayon_bundle_data() -> tuple[
]: ]:
studio_bundle_name = os.environ.get("AYON_STUDIO_BUNDLE_NAME") studio_bundle_name = os.environ.get("AYON_STUDIO_BUNDLE_NAME")
project_bundle_name = os.getenv("AYON_BUNDLE_NAME") project_bundle_name = os.getenv("AYON_BUNDLE_NAME")
# If AYON launcher <1.4.0 was used
if not studio_bundle_name:
studio_bundle_name = project_bundle_name
bundles = ayon_api.get_bundles()["bundles"] bundles = ayon_api.get_bundles()["bundles"]
studio_bundle = next( studio_bundle = next(
( (

3
client/pyproject.toml
View file

@ -19,3 +19,6 @@ OpenTimelineIO = "0.16.0"
opencolorio = "^2.3.2,<2.4.0" opencolorio = "^2.3.2,<2.4.0"
Pillow = "9.5.0" Pillow = "9.5.0"
websocket-client = ">=0.40.0,<2" websocket-client = ">=0.40.0,<2"
[ayon.runtimeDependencies.darwin]
pyobjc-core = "^11.1"