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

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

@ -130,6 +130,11 @@ def merge_task_layer(
map = AssetTransferMapping(local_col, external_col, local_tls) map = AssetTransferMapping(local_col, external_col, local_tls)
# Remove all transfer data from target objects
for source_obj in map.object_map:
target_obj = map.object_map[source_obj]
target_obj.transfer_data_ownership.clear()
transfer_core.apply_transfer_data(context, map.transfer_data_map) transfer_core.apply_transfer_data(context, map.transfer_data_map)
for source_obj in map.object_map: for source_obj in map.object_map:

5
scripts-blender/addons/asset_pipeline_2/transfer_data/transfer_core.py
View File

@ -82,11 +82,6 @@ def apply_transfer_data(context: bpy.types.Context, transfer_data_map) -> None:
context (bpy.types.Context): context of .blend file context (bpy.types.Context): context of .blend file
transfer_data_map: Map generated by class AssetTransferMapping transfer_data_map: Map generated by class AssetTransferMapping
""" """
target_objs = [
transfer_data_map[name].get("target_obj") for name in transfer_data_map
]
for target_obj in set(target_objs):
target_obj.transfer_data_ownership.clear()
for name in transfer_data_map: for name in transfer_data_map:
transfer_data = transfer_data_map[name] transfer_data = transfer_data_map[name]