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 +1 -2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 39fcd2bf3d - Show all commits

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

@ -150,8 +150,7 @@ def get_name_with_task_layer_prefix(name: str) -> str:
for task_layer_key in constants.TASK_LAYER_TYPES.keys(): for task_layer_key in constants.TASK_LAYER_TYPES.keys():
if name.startswith(task_layer_key + "."): if name.startswith(task_layer_key + "."):
return name return name
prefix = asset_pipe.prefix + "." if asset_pipe.prefix != "" else "" return prefix + "." + name
return prefix + name
def get_task_layer_col_name(task_layer_key) -> str: def get_task_layer_col_name(task_layer_key) -> str: