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

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

@ -47,6 +47,7 @@ def merge_task_layer(
external_col = bpy.data.collections[f"{col_base_name}.{external_suffix}"] external_col = bpy.data.collections[f"{col_base_name}.{external_suffix}"]
# TODO Make sure we preserve the collection hirearchies instead of having one flat col # TODO Make sure we preserve the collection hirearchies instead of having one flat col
# TODO Consider re-adding the TARGET collection
map = AssetTransferMapping(local_col, external_col, local_tls) map = AssetTransferMapping(local_col, external_col, local_tls)
# Find Transfer Data # Find Transfer Data

1
scripts-blender/addons/asset_pipeline_2/transferable_data.py
View File

@ -3,6 +3,7 @@ import bpy
from . import transfer_functions, asset_suffix from . import transfer_functions, asset_suffix
# TODO Consider using transfer mapping here instead of matching suffixes
def update_transfer_data_ownership(transfer_data_item, target_obj: bpy.types.Object): def update_transfer_data_ownership(transfer_data_item, target_obj: bpy.types.Object):
ownership = target_obj.transfer_data_ownership ownership = target_obj.transfer_data_ownership
transfer_items_names = [item.name for item in ownership] transfer_items_names = [item.name for item in ownership]