netrender fixes

exception safeguard in render engine
fix module import broken by someone else

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