studio/blender-studio-tools
13
30
Fork 19
Code Issues 20 Pull Requests 3 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
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 66edcc8c9a - Show all commits

4
scripts-blender/addons/asset_pipeline_2/ops.py
View File

@ -171,6 +171,10 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
return {'CANCELLED'} return {'CANCELLED'}
sync_target = core.find_sync_target(current_file) sync_target = core.find_sync_target(current_file)
if not sync_target.exists():
self.report({'ERROR'}, "Sync Target could not be determined")
return {'CANCELLED'}
if self.pull: if self.pull:
error_msg = core.merge_task_layer( error_msg = core.merge_task_layer(
context, context,