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

4
scripts-blender/addons/asset_pipeline_2/asset_mapping.py
View File

@ -144,7 +144,7 @@ class AssetTransferMapping:
) )
name = transfer_info.name + '_' + obj.name name = transfer_info.name + '_' + obj.name
transfer_data_map[name] = { transfer_data_map[name] = {
'transfer_info': temp_info, 'transfer_info': temp_info.name, # TODO avoid name collisions
'source_obj': obj, 'source_obj': obj,
'target_obj': target_obj, 'target_obj': target_obj,
} }
@ -163,7 +163,7 @@ class AssetTransferMapping:
) )
name = transfer_info.name + '_' + obj.name name = transfer_info.name + '_' + obj.name
transfer_data_map[name] = { transfer_data_map[name] = {
'transfer_info': temp_info, 'transfer_info': temp_info.name, # TODO avoid name collisions
'source_obj': obj, 'source_obj': obj,
'target_obj': target_obj, 'target_obj': target_obj,
} }

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

@ -89,8 +89,9 @@ def apply_transfer_data(context: bpy.types.Context, transfer_data_map) -> None:
""" """
for name in transfer_data_map: for name in transfer_data_map:
temp_transfer_data = context.scene.asset_pipeline.temp_transfer_data
transfer_data = transfer_data_map[name] transfer_data = transfer_data_map[name]
transfer_info = transfer_data.get('transfer_info') transfer_info = temp_transfer_data.get(transfer_data.get('transfer_info'))
target_obj = transfer_data.get('target_obj') target_obj = transfer_data.get('target_obj')
source_obj = transfer_data.get('source_obj') source_obj = transfer_data.get('source_obj')
if target_obj is None: if target_obj is None: