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

Merge branch 'develop' into mkdocs

Browse source
This commit is contained in:
Philippe Leprince 2025-03-13 18:25:51 +01:00 • committed by GitHub
commit 3e06feb224
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/ayon_core/pipeline/farm/pyblish_functions.py
View file

@ -808,14 +808,14 @@ def _create_instances_for_aov(
frames_to_render is not None frames_to_render is not None
and isinstance(collected_files, (list, tuple)) # not single file and isinstance(collected_files, (list, tuple)) # not single file
): ):
frames_to_render = convert_frames_str_to_list(frames_to_render) aov_frames_to_render = convert_frames_str_to_list(frames_to_render)
collections, _ = clique.assemble(collected_files) collections, _ = clique.assemble(collected_files)
collected_files = _get_real_files_to_render( collected_files = _get_real_files_to_render(
collections[0], frames_to_render) collections[0], aov_frames_to_render)
else: else:
frame_start = int(skeleton.get("frameStartHandle")) frame_start = int(skeleton.get("frameStartHandle"))
frame_end = int(skeleton.get("frameEndHandle")) frame_end = int(skeleton.get("frameEndHandle"))
frames_to_render = list(range(frame_start, frame_end + 1)) aov_frames_to_render = list(range(frame_start, frame_end + 1))
dynamic_data = { dynamic_data = {
"aov": aov, "aov": aov,
@ -937,8 +937,8 @@ def _create_instances_for_aov(
"name": ext, "name": ext,
"ext": ext, "ext": ext,
"files": collected_files, "files": collected_files,
"frameStart": frames_to_render[0], "frameStart": aov_frames_to_render[0],
"frameEnd": frames_to_render[-1], "frameEnd": aov_frames_to_render[-1],
# If expectedFile are absolute, we need only filenames # If expectedFile are absolute, we need only filenames
"stagingDir": staging_dir, "stagingDir": staging_dir,
"fps": new_instance.get("fps"), "fps": new_instance.get("fps"),

2
client/ayon_core/version.py
View file

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Package declaring AYON addon 'core' version.""" """Package declaring AYON addon 'core' version."""
__version__ = "1.1.4+dev" __version__ = "1.1.5+dev"

2
package.py
View file

@ -1,6 +1,6 @@
name = "core" name = "core"
title = "Core" title = "Core"
version = "1.1.4+dev" version = "1.1.5+dev"
client_dir = "ayon_core" client_dir = "ayon_core"

2
pyproject.toml
View file

@ -5,7 +5,7 @@
[tool.poetry] [tool.poetry]
name = "ayon-core" name = "ayon-core"
version = "1.1.4+dev" version = "1.1.5+dev"
description = "" description = ""
authors = ["Ynput Team <team@ynput.io>"] authors = ["Ynput Team <team@ynput.io>"]
readme = "README.md" readme = "README.md"