archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't show stack trace when BAT Pack was aborted

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-03-16 12:41:09 +01:00
parent 1d81f4bc38
commit 331e9e6ca0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blender_cloud/flamenco/__init__.py
View File

@ -356,6 +356,11 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
self.report({'ERROR'}, 'Unable to transfer %d files' % len(ex.files_remaining)) self.report({'ERROR'}, 'Unable to transfer %d files' % len(ex.files_remaining))
self.quit() self.quit()
return None, [] return None, []
except bat_interface.Aborted:
self.log.warning('BAT Pack was aborted')
self.report({'WARNING'}, 'Aborted Flamenco file packing/transferring')
self.quit()
return None, []
bpy.context.window_manager.flamenco_status = 'DONE' bpy.context.window_manager.flamenco_status = 'DONE'
return outfile, missing_sources return outfile, missing_sources

1
blender_cloud/flamenco/bat_interface.py
View File

@ -17,6 +17,7 @@ log = logging.getLogger(__name__)
_running_packer = None # type: pack.Packer _running_packer = None # type: pack.Packer
_packer_lock = threading.RLock() _packer_lock = threading.RLock()
Aborted = pack.Aborted
class BatProgress(progress.Callback): class BatProgress(progress.Callback):