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

13
scripts-blender/addons/asset_pipeline_2/merge/task_layer.py
View File

@ -15,10 +15,11 @@ def get_default_task_layer(td_type: str, name=""):
def get_transfer_data_owner(td_type_key: str, use_default_owner: bool, name=""):
if (
use_default_owner
or get_default_task_layer(td_type_key, name) in get_local_task_layers()
):
return get_default_task_layer(td_type_key, name)
default_tl = get_default_task_layer(td_type_key, name)
if use_default_owner:
return default_tl
else:
return get_local_task_layers()[0]
if default_tl in get_local_task_layers():
return default_tl
else:
return get_local_task_layers()[0]