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

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

@ -150,8 +150,6 @@ def task_layer_prefix_name_get(name: str, task_layer_owner: str) -> str:
return name return name
base_name = task_layer_prefix_basename_get(name) base_name = task_layer_prefix_basename_get(name)
if name == base_name:
return
prefix = config.TASK_LAYER_TYPES[task_layer_owner] prefix = config.TASK_LAYER_TYPES[task_layer_owner]
return prefix + "." + base_name return prefix + "." + base_name