diff options
author | Lipu Fei <lipu.fei815@gmail.com> | 2019-09-24 15:26:43 +0300 |
---|---|---|
committer | Lipu Fei <lipu.fei815@gmail.com> | 2019-09-24 15:26:43 +0300 |
commit | 94e89ad4ac36e6bdb5784d7a26d78e26da2f42e9 (patch) | |
tree | 231ffac63681f867fec3640dee1453a1212c179f /plugins/UFPWriter | |
parent | a741530db27b90013eedab8649bb6e22858938b7 (diff) | |
parent | bd314a765f6f8c04bd6b58d26876898b4e7b63e6 (diff) |
Fix merge conflicts with master
Diffstat (limited to 'plugins/UFPWriter')
-rw-r--r-- | plugins/UFPWriter/UFPWriter.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index d698cbfab7..e085adfd47 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -38,7 +38,11 @@ class UFPWriter(MeshWriter): def _createSnapshot(self, *args): # must be called from the main thread because of OpenGL Logger.log("d", "Creating thumbnail image...") - self._snapshot = Snapshot.snapshot(width = 300, height = 300) + try: + self._snapshot = Snapshot.snapshot(width = 300, height = 300) + except Exception: + Logger.logException("w", "Failed to create snapshot image") + self._snapshot = None # Failing to create thumbnail should not fail creation of UFP # This needs to be called on the main thread (Qt thread) because the serialization of material containers can # trigger loading other containers. Because those loaded containers are QtObjects, they must be created on the |