diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-12-21 05:46:19 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-12-21 05:46:19 +0300 |
| commit | c050f5f1deb7ae2627ce913f467e497a16a2aa2c (patch) | |
| tree | 4fce0524ba449a54bd8c1c132da8a1d5ac67d9f4 /release | |
| parent | 5affd02156e0c00df1bb2aff43df71b906b88e8c (diff) | |
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).
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/io/netrender/client.py | 3 | ||||
| -rw-r--r-- | release/scripts/io/netrender/ui.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index 91955e6cbc8..bbbb9f26051 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -229,7 +229,10 @@ class NetworkRenderEngine(bpy.types.RenderEngine): 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) diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index 5ef02fad17c..a9e2453d0e6 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -102,6 +102,8 @@ class RENDER_PT_network_job(RenderButtonsPanel): 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") |