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

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

@ -196,7 +196,7 @@ 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: if source_obj.data and source_obj.data.users > 1:
error_msg += f"Object {source_obj.name} contains multi-user datablock'\n" error_msg += f"Object {source_obj.name} contains multi-user datablock'\n"
return error_msg return error_msg
target_obj = map.object_map[source_obj] target_obj = map.object_map[source_obj]
@ -205,10 +205,10 @@ def merge_task_layer(
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]
if target_obj.data and target_obj.data.users > 1:
error_msg += f"Object {target_obj.name} contains multi-user datablock'\n"
return error_msg
remap_user(source_obj, target_obj) remap_user(source_obj, target_obj)
transfer_data_clean(target_obj) transfer_data_clean(target_obj)