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 -2
2 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 fd17b6db87 - Show all commits

1
scripts-blender/addons/asset_pipeline_2/merge/core.py
View File

@ -64,7 +64,6 @@ def ownership_get(
""" """
asset_pipe = scene.asset_pipeline asset_pipe = scene.asset_pipeline
asset_pipe.temp_transfer_data.clear() asset_pipe.temp_transfer_data.clear()
# TODO Figure out default in this case
default_task_layer = get_local_task_layers()[0] default_task_layer = get_local_task_layers()[0]

1
scripts-blender/addons/asset_pipeline_2/merge/shared_ids.py
View File

@ -33,7 +33,6 @@ def init_shared_ids(scene: bpy.types.Scene) -> list[bpy.types.ID]:
Returns: Returns:
list[bpy.types.ID]: A list of new 'shared_ids' owned by the file's task layer list[bpy.types.ID]: A list of new 'shared_ids' owned by the file's task layer
""" """
# TODO Figure our what is the default in this case
task_layer_key = get_local_task_layers()[0] task_layer_key = get_local_task_layers()[0]
shared_ids = [] shared_ids = []
asset_pipe = scene.asset_pipeline asset_pipe = scene.asset_pipeline