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

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

@ -4,7 +4,7 @@ from .. import constants
def get_local_task_layers(): def get_local_task_layers():
local_task_layer_strings = bpy.context.scene.asset_pipeline.local_task_layers local_task_layer_strings = bpy.context.scene.asset_pipeline.local_task_layers
return local_task_layer_strings.split(",") return [string for string in local_task_layer_strings.split(",") if string != ""]
def get_default_task_layer(td_type: str, name=""): def get_default_task_layer(td_type: str, name=""):
@ -15,7 +15,10 @@ def get_default_task_layer(td_type: str, name=""):
def get_transfer_data_owner(td_type_key: str, use_default_owner: bool, name=""): def get_transfer_data_owner(td_type_key: str, use_default_owner: bool, name=""):
if use_default_owner: 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) return get_default_task_layer(td_type_key, name)
else: else:
return get_local_task_layers()[0] return get_local_task_layers()[0]