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

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

@ -127,7 +127,6 @@ class AssetTransferMapping:
def _gen_transfer_data_map(self): def _gen_transfer_data_map(self):
transfer_data_map: Dict[bpy.types.Collection, bpy.types.Collection] = {} transfer_data_map: Dict[bpy.types.Collection, bpy.types.Collection] = {}
temp_transfer_data = bpy.context.scene.temp_transfer_data_ownership
for source_obj in self.object_map: for source_obj in self.object_map:
target_obj = self.object_map[source_obj] target_obj = self.object_map[source_obj]
objs = [source_obj, target_obj] objs = [source_obj, target_obj]
@ -135,18 +134,9 @@ class AssetTransferMapping:
if obj.name.endswith(constants.LOCAL_SUFFIX): if obj.name.endswith(constants.LOCAL_SUFFIX):
for transfer_info in obj.transfer_data_ownership: for transfer_info in obj.transfer_data_ownership:
if transfer_info.owner in self._local_tls: if transfer_info.owner in self._local_tls:
temp_info = transfer_core.transfer_data_add_entry( self._add_transfer_data_item(
transfer_data=temp_transfer_data, transfer_data_map, transfer_info, obj, target_obj
name=transfer_info.name,
td_type=transfer_info.type,
task_layer_name=transfer_info.owner,
) )
name = transfer_info.name + '_' + obj.name
transfer_data_map[name] = {
'transfer_info': temp_info,
'source_obj': obj,
'target_obj': target_obj,
}
if obj.name.endswith(constants.EXTERNAL_SUFFIX): if obj.name.endswith(constants.EXTERNAL_SUFFIX):
for transfer_info in obj.transfer_data_ownership: for transfer_info in obj.transfer_data_ownership:
@ -154,16 +144,26 @@ class AssetTransferMapping:
transfer_info.owner not in self._local_tls transfer_info.owner not in self._local_tls
and transfer_info.owner != "NONE" and transfer_info.owner != "NONE"
): ):
self._add_transfer_data_item(
transfer_data_map, transfer_info, obj, target_obj
)
return transfer_data_map
def _add_transfer_data_item(
self, transfer_data_map, transfer_info, source_obj, target_obj
):
temp_transfer_data = bpy.context.scene.temp_transfer_data_ownership
temp_info = transfer_core.transfer_data_add_entry( temp_info = transfer_core.transfer_data_add_entry(
transfer_data=temp_transfer_data, transfer_data=temp_transfer_data,
name=transfer_info.name, name=transfer_info.name,
td_type=transfer_info.type, td_type=transfer_info.type,
task_layer_name=transfer_info.owner, task_layer_name=transfer_info.owner,
) )
name = transfer_info.name + '_' + obj.name name = transfer_info.name + '_' + source_obj.name
transfer_data_map[name] = { transfer_data_map[name] = {
'transfer_info': temp_info, 'transfer_info': temp_info,
'source_obj': obj, 'source_obj': source_obj,
'target_obj': target_obj, 'target_obj': target_obj,
} }
return transfer_data_map