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

[Martin Poirier]

Revision: 25491
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25491
Author:   theeth
Date:     2009-12-21 03:46:19 +0100 (Mon, 21 Dec 2009)

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

- Add "Get Result" button after a job has been sent (this calls Animate and fetches the results back as render result buffers)
- Rendering (animate or single frame) without an active job was broken. Note that this launches a new job for each frame (it's impossible in a render engine to know if an animation is being rendered or a single frame only).

Modified Paths:
--------------
    trunk/blender/release/scripts/io/netrender/client.py
    trunk/blender/release/scripts/io/netrender/ui.py

Modified: trunk/blender/release/scripts/io/netrender/client.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/client.py	2009-12-21 02:39:39 UTC (rev 25490)
+++ trunk/blender/release/scripts/io/netrender/client.py	2009-12-21 02:46:19 UTC (rev 25491)
@@ -229,7 +229,10 @@
 			if response.status == http.client.NO_CONTENT:
 				new_job = True
 				netsettings.job_id = clientSendJob(conn, scene)
+				job_id = netsettings.job_id 
+				
 				requestResult(conn, job_id, scene.current_frame)
+				response = conn.getresponse()
 			
 			while response.status == http.client.ACCEPTED and not self.test_break():
 				time.sleep(1)

Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py	2009-12-21 02:39:39 UTC (rev 25490)
+++ trunk/blender/release/scripts/io/netrender/ui.py	2009-12-21 02:46:19 UTC (rev 25491)
@@ -102,6 +102,8 @@
 		if scene.network_render.server_address != "[default]":
 			col.operator("render.netclientanim", icon='RENDER_ANIMATION')
 			col.operator("render.netclientsend", icon='FILE_BLEND')
+			if scene.network_render.job_id:
+				col.operator("screen.render", text="Get Results", icon='RENDER_ANIMATION').animation = True
 			col.operator("render.netclientweb", icon='QUESTION')
 		col.prop(scene.network_render, "job_name")
 		col.prop(scene.network_render, "job_category")