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
1 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 cb2ec2e1ef - Show all commits

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

@ -198,6 +198,8 @@ class AssetTransferMapping:
external_id_name = get_target_name(local_id.name) external_id_name = get_target_name(local_id.name)
id_storage = get_storage_of_id(local_id) id_storage = get_storage_of_id(local_id)
external_id = id_storage.get(external_id_name) external_id = id_storage.get(external_id_name)
if not external_id:
continue
self._check_id_conflict(external_id, local_id) self._check_id_conflict(external_id, local_id)
if ( if (
local_id.asset_id_owner in self._local_tls local_id.asset_id_owner in self._local_tls