studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 Projects Releases 1 Activity

Asset Pipeline v2 #145

Closed
Nick Alberelli wants to merge 431 commits from (deleted):feature/asset-pipeline-v2 into main
pull from: (deleted):feature/asset-pipeline-v2
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 26 Commits 431 Files Changed 70 +7 -10
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 909f3eea9b - Show all commits

15
scripts-blender/addons/asset_pipeline_2/merge/naming.py
View File

@ -146,13 +146,11 @@ def task_layer_prefix_name_get(name: str, task_layer_owner: str) -> str:
Returns:
str: Returns name with prefix
"""
if name.startswith(config.TASK_LAYER_TYPES[task_layer_owner] + "."):
for task_layer_key in config.TASK_LAYER_TYPES:
if name.startswith(config.TASK_LAYER_TYPES[task_layer_key] + "."):
return name
base_name = task_layer_prefix_basename_get(name)
prefix = config.TASK_LAYER_TYPES[task_layer_owner]
return prefix + "." + base_name
return prefix + "." + name
def task_layer_prefix_basename_get(name: str) -> str:
@ -169,10 +167,9 @@ def task_layer_prefix_transfer_data_update(transfer_data_item):
obj = transfer_data_item.id_data
td_data = data_type_from_transfer_data_key(obj, transfer_data_item.type)
new_name = task_layer_prefix_name_get(
transfer_data_item.name, transfer_data_item.owner
)
base_name = task_layer_prefix_basename_get(transfer_data_item.name)
prefix = config.TASK_LAYER_TYPES[transfer_data_item.owner]
new_name = prefix + "." + base_name
if new_name == transfer_data_item.name or not td_data.get(transfer_data_item.name):
return