Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Poirier <theeth@yahoo.com>2010-03-29 00:46:25 +0400
committerMartin Poirier <theeth@yahoo.com>2010-03-29 00:46:25 +0400
commitc4f0a07267a3b76759d7d2f45035f12ad5f68e45 (patch)
tree91a77bfc65dbe9c165eb97c36dcc6b4ad04e0bc5 /release
parent41425c1aa49bdfe31e2568198807d66f8fff5070 (diff)
Netrender: Fix for API changes (it would be nice if people at least fixed built-in script when breaking things)
Also force post process off. This is a partial fix for Bug [#21410], there is still the problem that loading back multilayer exr as render results doesn't load the composited result correctly (bug is assigned to Brecht). The results are still ok when downloaded outside of the render engine, so there's a work around for now.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/io/netrender/client.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py
index aea9c37ff47..792a699bfe8 100644
--- a/release/scripts/io/netrender/client.py
+++ b/release/scripts/io/netrender/client.py
@@ -186,6 +186,7 @@ def requestResult(conn, job_id, frame):
class NetworkRenderEngine(bpy.types.RenderEngine):
bl_idname = 'NET_RENDER'
bl_label = "Network Render"
+ bl_postprocess = False
def render(self, scene):
if scene.network_render.mode == "RENDER_CLIENT":
self.render_client(scene)
@@ -268,7 +269,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
f.close()
result = self.begin_result(0, 0, x, y)
- result.load_from_file(netsettings.path + "output.exr", 0, 0)
+ result.load_from_file(netsettings.path + "output.exr")
self.end_result(result)
conn.close()