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

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

@ -146,7 +146,9 @@ class AssetTransferMapping:
'source_obj': obj, 'source_obj': obj,
'target_obj': target_obj, 'target_obj': target_obj,
} }
name = transfer_info.name + '_' + obj.name # Names of each map item need to be unique
# below name avoids name conflicts between different types
name = transfer_info.name + '_' + transfer_info.type + obj.name
return name, map_item return name, map_item
def _check_transfer_data_conflict(self, obj, transfer_info): def _check_transfer_data_conflict(self, obj, transfer_info):