diff options
author | Martin Poirier <theeth@yahoo.com> | 2011-07-25 01:15:27 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2011-07-25 01:15:27 +0400 |
commit | 925f9bfe6f03474a58bdb5b20d0aafffc9504b6a (patch) | |
tree | 522c532baa90dd6a10e3744b57a1853b45595966 | |
parent | 1932b0f6f92a0990d769093d7b76870f546b8010 (diff) |
netrender fixes
exception safeguard in render engine
fix module import broken by someone else
-rw-r--r-- | netrender/client.py | 20 | ||||
-rw-r--r-- | netrender/utils.py | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/netrender/client.py b/netrender/client.py index 26504884..ed94282b 100644 --- a/netrender/client.py +++ b/netrender/client.py @@ -267,14 +267,18 @@ class NetworkRenderEngine(bpy.types.RenderEngine): bl_label = "Network Render" bl_use_postprocess = False def render(self, scene): - if scene.network_render.mode == "RENDER_CLIENT": - self.render_client(scene) - elif scene.network_render.mode == "RENDER_SLAVE": - self.render_slave(scene) - elif scene.network_render.mode == "RENDER_MASTER": - self.render_master(scene) - else: - print("UNKNOWN OPERATION MODE") + try: + if scene.network_render.mode == "RENDER_CLIENT": + self.render_client(scene) + elif scene.network_render.mode == "RENDER_SLAVE": + self.render_slave(scene) + elif scene.network_render.mode == "RENDER_MASTER": + self.render_master(scene) + else: + print("UNKNOWN OPERATION MODE") + except Exception as e: + self.report('ERROR', str(e)) + raise e def render_master(self, scene): netsettings = scene.network_render diff --git a/netrender/utils.py b/netrender/utils.py index d615685a..f1e8640b 100644 --- a/netrender/utils.py +++ b/netrender/utils.py @@ -16,7 +16,7 @@ # # ##### END GPL LICENSE BLOCK ##### -import sys, os +import sys, os, re import http, http.client, http.server, socket import subprocess, time, hashlib |