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

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

@ -209,6 +209,8 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
) )
if error_msg: if error_msg:
bpy.ops.wm.open_mainfile(filepath=temp_file.__str__())
bpy.ops.wm.save_as_mainfile(filepath=current_file.__str__())
self.report({'ERROR'}, error_msg) self.report({'ERROR'}, error_msg)
return {'CANCELLED'} return {'CANCELLED'}