[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27431] trunk/blender/release/scripts/io/ netrender: netrender:

[Martin Poirier]

Revision: 27431
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27431
Author:   theeth
Date:     2010-03-12 04:12:27 +0100 (Fri, 12 Mar 2010)

Log Message:
-----------
netrender: 

sensible timeout on connection attempt
fix for operator api change

Modified Paths:
--------------
    trunk/blender/release/scripts/io/netrender/operators.py
    trunk/blender/release/scripts/io/netrender/utils.py

Modified: trunk/blender/release/scripts/io/netrender/operators.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/operators.py	2010-03-12 02:44:18 UTC (rev 27430)
+++ trunk/blender/release/scripts/io/netrender/operators.py	2010-03-12 03:12:27 UTC (rev 27431)
@@ -104,7 +104,7 @@
             scene.network_render.job_id = client.clientSendJob(conn, scene, True)
             conn.close()
 
-        bpy.ops.screen.render('INVOKE_AREA', animation=True)
+        bpy.ops.render.render('INVOKE_AREA', animation=True)
 
         return {'FINISHED'}
 
@@ -121,7 +121,7 @@
         return True
 
     def execute(self, context):
-        bpy.ops.screen.render('INVOKE_AREA', animation=True)
+        bpy.ops.render.render('INVOKE_AREA', animation=True)
 
         return {'FINISHED'}
 

Modified: trunk/blender/release/scripts/io/netrender/utils.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/utils.py	2010-03-12 02:44:18 UTC (rev 27430)
+++ trunk/blender/release/scripts/io/netrender/utils.py	2010-03-12 03:12:27 UTC (rev 27431)
@@ -110,7 +110,7 @@
             return None
 
     try:
-        conn = http.client.HTTPConnection(address, port)
+        conn = http.client.HTTPConnection(address, port, timeout = 5)
 
         if conn:
             if clientVerifyVersion(conn):