Merge branch 'hotfix/skip_integration_if_delete_in_tags' into 2.x/develop

This commit is contained in:
Milan Kolar 2020-08-20 12:31:50 +02:00
commit 016ef408ac
2 changed files with 15 additions and 1 deletions

View file

@ -297,6 +297,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
# in current codebase
instance.data['transfers'] = list(orig_transfers)
if "delete" in repre.get("tags", []):
continue
published_files = []
# create template data for Anatomy

View file

@ -203,6 +203,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
# script path for publish_filesequence.py
publishing_script = None
# poor man exclusion
skip_integration_repre_list = []
def _create_metadata_path(self, instance):
ins_data = instance.data
# Ensure output dir exists
@ -500,6 +503,10 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
"tags": ["review"] if preview else []
}
# poor man exclusion
if ext in self.skip_integration_repre_list:
rep["tags"].append("delete")
self._solve_families(new_instance, preview)
new_instance["representations"] = [rep]
@ -579,8 +586,12 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
"tags": ["review", "preview"] if preview else [],
}
# poor man exclusion
if ext in self.skip_integration_repre_list:
rep["tags"].append("delete")
if instance.get("multipartExr", False):
rep["tags"].append["multipartExr"]
rep["tags"].append("multipartExr")
representations.append(rep)