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

2
scripts-blender/addons/asset_pipeline_2/core.py
View File

@ -172,7 +172,7 @@ def merge_task_layer(
if len(map.conflict_objects) != 0: if len(map.conflict_objects) != 0:
error_msg = '' error_msg = ''
for conflict_obj in map.conflict_objects: for conflict_obj in map.conflict_objects:
error_msg += f"Ownership conflic found for '{conflict_obj.name}'\n" error_msg += f"Ownership conflict found for '{conflict_obj.name}'\n"
return error_msg return error_msg
# Remove all transfer data from target objects # Remove all transfer data from target objects