[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2166] trunk/py/scripts/addons/ netrender: netrender fixes

[Martin Poirier]

Revision: 2166
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2166
Author:   theeth
Date:     2011-07-24 21:15:27 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
netrender fixes

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

Modified Paths:
--------------
    trunk/py/scripts/addons/netrender/client.py
    trunk/py/scripts/addons/netrender/utils.py

Modified: trunk/py/scripts/addons/netrender/client.py
===================================================================
--- trunk/py/scripts/addons/netrender/client.py	2011-07-24 06:42:48 UTC (rev 2165)
+++ trunk/py/scripts/addons/netrender/client.py	2011-07-24 21:15:27 UTC (rev 2166)
@@ -267,14 +267,18 @@
     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

Modified: trunk/py/scripts/addons/netrender/utils.py
===================================================================
--- trunk/py/scripts/addons/netrender/utils.py	2011-07-24 06:42:48 UTC (rev 2165)
+++ trunk/py/scripts/addons/netrender/utils.py	2011-07-24 21:15:27 UTC (rev 2166)
@@ -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