Merge branch 'develop' into enhancement/staging-dir-enhancements

This commit is contained in:
Jakub Trllo 2025-01-09 11:22:01 +01:00 committed by GitHub
commit 28b90ab0bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

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)