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

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

@ -179,15 +179,14 @@ def merge_task_layer(
external_col = bpy.data.collections[f"{col_base_name}.{external_suffix}"] external_col = bpy.data.collections[f"{col_base_name}.{external_suffix}"]
map = AssetTransferMapping(local_col, external_col, local_tls) map = AssetTransferMapping(local_col, external_col, local_tls)
error_msg = ''
if len(map.conflict_transfer_data) != 0: if len(map.conflict_transfer_data) != 0:
error_msg = ''
for conflict in map.conflict_transfer_data: for conflict in map.conflict_transfer_data:
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_ids) != 0: if len(map.conflict_ids) != 0:
error_msg = ''
for conflict_obj in map.conflict_ids: for conflict_obj in map.conflict_ids:
type_name = get_id_type_name(type(conflict_obj)) type_name = get_id_type_name(type(conflict_obj))
error_msg += ( error_msg += (
@ -197,12 +196,22 @@ def merge_task_layer(
# Remove all transfer data from target objects # Remove all transfer data from target objects
for source_obj in map.object_map: for source_obj in map.object_map:
if source_obj.data.users > 1:
error_msg += (
f"Object {source_obj.name} contains multi-user datablock'\n"
)
return error_msg
target_obj = map.object_map[source_obj] target_obj = map.object_map[source_obj]
target_obj.transfer_data_ownership.clear() target_obj.transfer_data_ownership.clear()
apply_transfer_data(context, map.transfer_data_map) apply_transfer_data(context, map.transfer_data_map)
for source_obj in map.object_map: for source_obj in map.object_map:
if target_obj.data.users > 1:
error_msg += (
f"Object {source_obj.name} contains multi-user datablock'\n"
)
return error_msg
target_obj = map.object_map[source_obj] target_obj = map.object_map[source_obj]
remap_user(source_obj, target_obj) remap_user(source_obj, target_obj)
transfer_data_clean(target_obj) transfer_data_clean(target_obj)