studio/blender-studio-tools
13
30
Fork 19
Code Issues 20 Pull Requests 3 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 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9c8523ca6 - Show all commits

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

@ -146,10 +146,12 @@ def get_name_with_task_layer_prefix(name: str, td_type_key: str) -> str:
Returns:
str: Returns name with prefix
"""
prefix = get_default_task_layer(td_type_key)
default_task_layer = get_default_task_layer(td_type_key)
for task_layer_key in config.TASK_LAYER_TYPES:
if name.startswith(task_layer_key + "."):
if name.startswith(config.TASK_LAYER_TYPES[task_layer_key] + "."):
return name
prefix = config.TASK_LAYER_TYPES[default_task_layer]
return prefix + "." + name