Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

deadline: fixing misidentification of revieables #3356

Merged
merged 3 commits into from
Jun 17, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions openpype/modules/deadline/plugins/publish/submit_publish_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,6 @@ def _get_representations(self, instance, exp_files):
def _solve_families(self, instance, preview=False):
families = instance.get("families")

# test also instance data review attribute
preview = preview or instance.get("review")

# if we have one representation with preview tag
# flag whole instance for review and for ftrack
if preview:
Expand Down Expand Up @@ -725,10 +722,17 @@ def process(self, instance):
" This may cause issues."
).format(source))

families = ["render"]
family = "render"
if "prerender" in instance.data["families"]:
family = "prerender"
families = [family]

# pass review to families if marked as review
if data.get("review"):
families.append("review")

instance_skeleton_data = {
"family": "render",
"family": family,
"subset": subset,
"families": families,
"asset": asset,
Expand All @@ -750,15 +754,6 @@ def process(self, instance):
"useSequenceForReview": data.get("useSequenceForReview", True)
}

if "prerender" in instance.data["families"]:
instance_skeleton_data.update({
"family": "prerender",
"families": []})

# also include review attribute if available
if "review" in data:
instance_skeleton_data["review"] = data["review"]

# skip locking version if we are creating v01
instance_version = instance.data.get("version") # take this if exists
if instance_version != 1:
Expand Down