Merge branch 'hotfix/psd-batch-publisher'

pype/plugins/global/publish/collect_anatomy_instance_data.py

@@ -39,11 +39,21 @@ class CollectAnatomyInstanceData(pyblish.api.InstancePlugin):
         anatomy_data = copy.deepcopy(instance.context.data["anatomyData"])
         project_entity = instance.context.data["projectEntity"]
         context_asset_entity = instance.context.data["assetEntity"]
+        instance_asset_entity = instance.data.get("assetEntity")
 
         asset_name = instance.data["asset"]
+
+        # There is possibility that assetEntity on instance is already set
+        # which can happen in standalone publisher
+        if (
+            instance_asset_entity
+            and instance_asset_entity["name"] == asset_name
+        ):
+            asset_entity = instance_asset_entity
+
         # Check if asset name is the same as what is in context
         # - they may be different, e.g. in NukeStudio
-        if context_asset_entity["name"] == asset_name:
+        elif context_asset_entity["name"] == asset_name:
             asset_entity = context_asset_entity
 
         else:
@@ -92,6 +102,12 @@ class CollectAnatomyInstanceData(pyblish.api.InstancePlugin):
             "subset": subset_name,
             "version": version_number
         }
+        if (
+            asset_entity
+            and asset_entity["_id"] != context_asset_entity["_id"]
+        ):
+            parents = asset_entity["data"].get("parents") or list()
+            anatomy_updates["hierarchy"] = "/".join(parents)
 
         task_name = instance.data.get("task")
         if task_name:

pype/plugins/global/publish/integrate_new.py

@@ -84,7 +84,8 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 "action",
                 "harmony.template",
                 "harmony.palette",
-                "editorial"
+                "editorial",
+                "background"
                 ]
     exclude_families = ["clip"]
     db_representation_context_keys = [