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

2
scripts-blender/addons/asset_pipeline_2/core.py
View File

@ -108,9 +108,9 @@ def get_task_layer_col_name(task_layer_key):
def get_name_with_asset_prefix(name: str): def get_name_with_asset_prefix(name: str):
# TODO Docstring and return types # TODO Docstring and return types
asset_pipe = bpy.context.scene.asset_pipeline
if name.startswith(asset_pipe.prefix + "."): if name.startswith(asset_pipe.prefix + "."):
return name return name
asset_pipe = bpy.context.scene.asset_pipeline
prefix = asset_pipe.prefix + "." if asset_pipe.prefix != "" else "" prefix = asset_pipe.prefix + "." if asset_pipe.prefix != "" else ""
return prefix + name return prefix + name