Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Fix: shot duplicate name using shot's hierarchy (ep, seq) #3535

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions openpype/modules/kitsu/utils/update_op_with_zou.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
get_project,
get_assets,
get_asset_by_id,
get_asset_by_name
get_asset_by_name,
)
from openpype.pipeline import AvalonMongoDB
from openpype.api import get_project_settings
Expand Down Expand Up @@ -181,8 +181,8 @@ def update_op_assets(
# Find root folder docs
root_folder_docs = get_assets(
project_name,
asset_name=[entity_parent_folders[-1]],
fields=["_id", "data.root_of"]
asset_names=[entity_parent_folders[-1]],
fields=["_id", "data.root_of"],
)
# NOTE: Not sure why it's checking for entity type?
# OP3 does not support multiple assets with same names so type
Expand Down Expand Up @@ -221,6 +221,13 @@ def update_op_assets(
parent_entity = parent_doc["data"]["zou"]
parent_zou_id = parent_entity["parent_id"]

if item_type in ["Shot", "Sequence"]:
# Name with parents hierarchy "({episode}_){sequence}_{shot}"
# to avoid duplicate name issue
item_name = "_".join(item_data["parents"] + [item_doc["name"]])
else:
item_name = item_doc["name"]

# Set root folders parents
item_data["parents"] = entity_parent_folders + item_data["parents"]

Expand All @@ -234,7 +241,7 @@ def update_op_assets(
item_doc["_id"],
{
"$set": {
"name": item["name"],
"name": item_name,
"data": item_data,
"parent": asset_doc_ids[item["project_id"]]["_id"],
}
Expand Down