Merge branch 'develop' into bugfix/fps_retime_rounding_issue

This commit is contained in:
robin@ynput.io 2025-01-08 16:37:41 +01:00
commit ce0a140d94
6 changed files with 16 additions and 12 deletions

View file

@ -178,7 +178,10 @@ class CollectOtioSubsetResources(
repre = self._create_representation(
frame_start, frame_end, collection=collection)
if "review" in instance.data["families"]:
if (
not instance.data.get("otioReviewClips")
and "review" in instance.data["families"]
):
review_repre = self._create_representation(
frame_start, frame_end, collection=collection,
delete=True, review=True)
@ -197,7 +200,10 @@ class CollectOtioSubsetResources(
repre = self._create_representation(
frame_start, frame_end, file=filename, trim=_trim)
if "review" in instance.data["families"]:
if (
not instance.data.get("otioReviewClips")
and "review" in instance.data["families"]
):
review_repre = self._create_representation(
frame_start, frame_end,
file=filename, delete=True, review=True)