From ebbc5f6fa908fcc9a2009e04475f987a1447680b Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Fri, 25 Oct 2019 16:20:23 +0200 Subject: [PATCH] hotfix: forgotten instance of silos --- .../global/publish/extract_hierarchy_avalon.py | 11 ++--------- .../global/publish/integrate_rendered_frames.py | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pype/plugins/global/publish/extract_hierarchy_avalon.py b/pype/plugins/global/publish/extract_hierarchy_avalon.py index a2e17f23ac..318a6db105 100644 --- a/pype/plugins/global/publish/extract_hierarchy_avalon.py +++ b/pype/plugins/global/publish/extract_hierarchy_avalon.py @@ -72,13 +72,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): entity = io.find_one({"type": "asset", "name": name}) # Create entity if doesn"t exist if entity is None: - if self.project["_id"] == parent["_id"]: - silo = None - elif parent["silo"] is None: - silo = parent["name"] - else: - silo = parent["silo"] - entity = self.create_avalon_asset(name, silo, data) + entity = self.create_avalon_asset(name, data) # Update entity data with input data io.update_many({"_id": entity["_id"]}, {"$set": {"data": data}}) @@ -86,11 +80,10 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): if "childs" in entity_data: self.import_to_avalon(entity_data["childs"], entity) - def create_avalon_asset(self, name, silo, data): + def create_avalon_asset(self, name, data): item = { "schema": "avalon-core:asset-3.0", "name": name, - "silo": silo, "parent": self.project["_id"], "type": "asset", "data": data diff --git a/pype/plugins/global/publish/integrate_rendered_frames.py b/pype/plugins/global/publish/integrate_rendered_frames.py index cb8f2d8608..945539462e 100644 --- a/pype/plugins/global/publish/integrate_rendered_frames.py +++ b/pype/plugins/global/publish/integrate_rendered_frames.py @@ -152,7 +152,7 @@ class IntegrateFrames(pyblish.api.InstancePlugin): template_data = {"root": root, "project": {"name": PROJECT, "code": project['data']['code']}, - "silo": asset['silo'], + "silo": asset.get('silo'), "task": api.Session["AVALON_TASK"], "asset": ASSET, "family": instance.data['family'],