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

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

@ -211,6 +211,7 @@ class AssetTransferMapping:
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)
# TODO Check for conflicts # TODO Check for conflicts
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
and local_id.asset_id_owner != "NONE" and local_id.asset_id_owner != "NONE"

10
scripts-blender/addons/asset_pipeline_2/merge/core.py
View File

@ -13,6 +13,7 @@ from .naming import (
remove_suffix_from_hierarchy, remove_suffix_from_hierarchy,
get_name_with_asset_prefix, get_name_with_asset_prefix,
get_task_layer_col_name, get_task_layer_col_name,
get_id_type_name,
) )
@ -179,10 +180,13 @@ def merge_task_layer(
error_msg += f"Transfer Data conflict found for '{conflict.name}' on obj '{conflict.id_data.name}'\n" error_msg += f"Transfer Data conflict found for '{conflict.name}' on obj '{conflict.id_data.name}'\n"
return error_msg return error_msg
if len(map.conflict_objects) != 0: if len(map.conflict_ids) != 0:
error_msg = '' error_msg = ''
for conflict_obj in map.conflict_objects: for conflict_obj in map.conflict_ids:
error_msg += f"Ownership conflict found for '{conflict_obj.name}'\n" type_name = get_id_type_name(type(conflict_obj))
error_msg += (
f"Ownership conflict found for {type_name}: '{conflict_obj.name}'\n"
)
return error_msg return error_msg
# Remove all transfer data from target objects # Remove all transfer data from target objects