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

6
scripts-blender/addons/asset_pipeline_2/merge/asset_mapping.py
View File

@ -202,11 +202,11 @@ class AssetTransferMapping:
and other_transfer_data_item.owner != transfer_data_item.owner and other_transfer_data_item.owner != transfer_data_item.owner
): ):
if transfer_data_item.owner in self._local_tls: if transfer_data_item.owner in self._local_tls:
target_obj = obj
source_obj = other_obj
else:
target_obj = other_obj target_obj = other_obj
source_obj = obj source_obj = obj
else:
target_obj = obj
source_obj = other_obj
return self._get_transfer_data_map_item( return self._get_transfer_data_map_item(
source_obj, target_obj, transfer_data_item source_obj, target_obj, transfer_data_item