From 64436505d16d7de77f1fcd2c2a22199596525e3b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 12 Apr 2021 12:39:57 +0200 Subject: [PATCH] Nuke: fixing mixup with families in version, enabling prerender publish https://github.com/pypeclub/pype/commit/cf4de238f596019ca9fcdee2e25992acca1165bf --- .../nuke/plugins/publish/precollect_instances.py | 16 +++++++++++----- .../nuke/plugins/publish/precollect_writes.py | 2 ++ .../plugins/publish/submit_publish_job.py | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/precollect_instances.py b/openpype/hosts/nuke/plugins/publish/precollect_instances.py index 2d25b29826..92f96ea48d 100644 --- a/openpype/hosts/nuke/plugins/publish/precollect_instances.py +++ b/openpype/hosts/nuke/plugins/publish/precollect_instances.py @@ -80,25 +80,31 @@ class PreCollectNukeInstances(pyblish.api.ContextPlugin): # Add all nodes in group instances. if node.Class() == "Group": - # check if it is write node in family - if "write" in families: + # only alter families for render family + if "write" in families_ak: target = node["render"].value() if target == "Use existing frames": # Local rendering self.log.info("flagged for no render") - families.append("render") + families.append(family) elif target == "Local": # Local rendering self.log.info("flagged for local render") - families.append("{}.local".format("render")) + families.append("{}.local".format(family)) elif target == "On farm": # Farm rendering self.log.info("flagged for farm render") instance.data["transfer"] = False - families.append("{}.farm".format("render")) + families.append("{}.farm".format(family)) + + # suffle family to `write` as it is main family + # this will be changed later on in process if "render" in families: families.remove("render") family = "write" + elif "prerender" in families: + families.remove("prerender") + family = "write" node.begin() for i in nuke.allNodes(): diff --git a/openpype/hosts/nuke/plugins/publish/precollect_writes.py b/openpype/hosts/nuke/plugins/publish/precollect_writes.py index a519609f52..57303bd42e 100644 --- a/openpype/hosts/nuke/plugins/publish/precollect_writes.py +++ b/openpype/hosts/nuke/plugins/publish/precollect_writes.py @@ -108,6 +108,8 @@ class CollectNukeWrites(pyblish.api.InstancePlugin): # Add version data to instance version_data = { + "families": [f.replace(".local", "").replace(".farm", "") + for f in families if "write" not in f], "colorspace": node["colorspace"].value(), } diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index a2e21fb766..ea953441a2 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -102,7 +102,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): hosts = ["fusion", "maya", "nuke", "celaction", "aftereffects", "harmony"] - families = ["render.farm", "prerender", + families = ["render.farm", "prerender.farm", "renderlayer", "imagesequence", "vrayscene"] aov_filter = {"maya": [r".+(?:\.|_)([Bb]eauty)(?:\.|_).*"],