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

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

@ -223,13 +223,12 @@ class AssetTransferMapping:
return None return None
def _gen_transfer_data_map(self): def _gen_transfer_data_map(self):
context = bpy.context context = bpy.context # Bruh.
transfer_data_map: Dict[bpy.types.Collection, bpy.types.Collection] = {} transfer_data_map: Dict[bpy.types.Collection, bpy.types.Collection] = {}
temp_transfer_data = context.scene.asset_pipeline.temp_transfer_data temp_transfer_data = context.scene.asset_pipeline.temp_transfer_data
temp_transfer_data.clear() temp_transfer_data.clear()
for source_obj in self.object_map: for objs in self.object_map.items():
target_obj = self.object_map[source_obj] source_obj, target_obj = objs
objs = [source_obj, target_obj]
for obj in objs: for obj in objs:
for transfer_data_item in obj.transfer_data_ownership: for transfer_data_item in obj.transfer_data_ownership:
self._check_transfer_data_conflict(obj, transfer_data_item) self._check_transfer_data_conflict(obj, transfer_data_item)