Merge branch 'develop' into main

This commit is contained in:
Jakub Jezek 2023-12-12 17:44:13 +01:00
commit b8e18f0f90
No known key found for this signature in database
GPG key ID: 730D7C02726179A7
2 changed files with 3 additions and 2 deletions

View file

@ -82,7 +82,7 @@ class CollectResourcesPath(pyblish.api.InstancePlugin):
# Add fill keys for editorial publishing creating new entity
# TODO handle in editorial plugin
if instance.data.get("newAssetPublishing"):
if "hierarchy" not in instance.data:
if "hierarchy" not in template_data:
template_data["hierarchy"] = instance.data["hierarchy"]
if "asset" not in template_data:

View file

@ -204,7 +204,8 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
project_item = None
project_children_context = None
for key, value in context.data["hierarchyContext"].items():
hierarchy_context = copy.deepcopy(context.data["hierarchyContext"])
for key, value in hierarchy_context.items():
project_item = copy.deepcopy(value)
project_children_context = project_item.pop("childs", None)
project_item["name"] = key