mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge
This commit is contained in:
commit
b6945c1e14
1 changed files with 6 additions and 4 deletions
|
|
@ -377,8 +377,8 @@ def prepare_representations(
|
||||||
" This may cause issues on farm."
|
" This may cause issues on farm."
|
||||||
).format(staging))
|
).format(staging))
|
||||||
|
|
||||||
frame_start = int(frames_to_render[0])
|
frame_start = frames_to_render[0]
|
||||||
frame_end = int(frames_to_render[-1])
|
frame_end = frames_to_render[-1]
|
||||||
if skeleton_data.get("slate"):
|
if skeleton_data.get("slate"):
|
||||||
frame_start -= 1
|
frame_start -= 1
|
||||||
|
|
||||||
|
|
@ -487,8 +487,9 @@ def _get_real_frames_to_render(frames):
|
||||||
frames_to_render.extend(
|
frames_to_render.extend(
|
||||||
range(int(splitted[0]), int(splitted[1])+1))
|
range(int(splitted[0]), int(splitted[1])+1))
|
||||||
else:
|
else:
|
||||||
frames_to_render.append(frame)
|
frames_to_render.append(int(frame))
|
||||||
return [str(frame_to_render) for frame_to_render in frames_to_render]
|
frames_to_render.sort()
|
||||||
|
return frames_to_render
|
||||||
|
|
||||||
|
|
||||||
def _get_real_files_to_rendered(collection, frames_to_render):
|
def _get_real_files_to_rendered(collection, frames_to_render):
|
||||||
|
|
@ -501,6 +502,7 @@ def _get_real_files_to_rendered(collection, frames_to_render):
|
||||||
"""
|
"""
|
||||||
files = [os.path.basename(f) for f in list(collection)]
|
files = [os.path.basename(f) for f in list(collection)]
|
||||||
file_name, extracted_frame = list(collect_frames(files).items())[0]
|
file_name, extracted_frame = list(collect_frames(files).items())[0]
|
||||||
|
|
||||||
if not extracted_frame:
|
if not extracted_frame:
|
||||||
return files
|
return files
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue