From a364b90ae330d2a3691cb219e8f5df83497c5373 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 19 Mar 2020 10:50:48 +0100 Subject: [PATCH] integrate_new store subset and version entity to instance.data --- pype/plugins/global/publish/integrate_master_version.py | 5 +---- pype/plugins/global/publish/integrate_new.py | 7 +++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pype/plugins/global/publish/integrate_master_version.py b/pype/plugins/global/publish/integrate_master_version.py index 715d99c1c8..1cee7d1f24 100644 --- a/pype/plugins/global/publish/integrate_master_version.py +++ b/pype/plugins/global/publish/integrate_master_version.py @@ -61,13 +61,10 @@ class IntegrateMasterVersion(pyblish.api.InstancePlugin): master_publish_dir = self.get_publish_dir(instance) - src_version_entity = None + src_version_entity = instance.data.get("versionEntity") filtered_repre_ids = [] for repre_id, repre_info in published_repres.items(): repre = repre_info["representation"] - if src_version_entity is None: - src_version_entity = repre_info.get("version_entity") - if repre["name"].lower() in self.ignored_representation_names: self.log.debug( "Filtering representation with name: `{}`".format( diff --git a/pype/plugins/global/publish/integrate_new.py b/pype/plugins/global/publish/integrate_new.py index 8c27ccfa84..71a045a004 100644 --- a/pype/plugins/global/publish/integrate_new.py +++ b/pype/plugins/global/publish/integrate_new.py @@ -162,6 +162,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): ) subset = self.get_subset(asset_entity, instance) + instance.data["subsetEntity"] = subset version_number = instance.data["version"] self.log.debug("Next version: v{}".format(version_number)) @@ -237,6 +238,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): ) version = io.find_one({"_id": version_id}) + instance.data["versionEntity"] = version existing_repres = list(io.find({ "parent": version_id, @@ -463,10 +465,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): published_representations[repre_id] = { "representation": representation, "anatomy_data": template_data, - "published_files": published_files, - # TODO prabably should store subset and version to instance - "subset_entity": subset, - "version_entity": version + "published_files": published_files } self.log.debug("__ representations: {}".format(representations))