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-01-08 20:52:21 +0300
committerMartin Poirier <theeth@yahoo.com>2010-01-08 20:52:21 +0300
commiteb2e64afa5b229f8290159ee8cc70a2996f5a3d0 (patch)
treef64722e2231cc0cdb463fe92acc8abf5bc539f95 /release/scripts/io/netrender/client.py
parent1f1245a92a21b4744495549b951caf59fea06765 (diff)
netrender: bugfix to make thumbnails work correctly when running master through the UI (not in background) [context is borked in that case]. Also show number of threads settings in slave settings (reusing render setting) and force that setting when rendering jobs.
Diffstat (limited to 'release/scripts/io/netrender/client.py')
-rw-r--r--release/scripts/io/netrender/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py
index 877f4f85dec..01130907553 100644
--- a/release/scripts/io/netrender/client.py
+++ b/release/scripts/io/netrender/client.py
@@ -201,7 +201,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
def render_slave(self, scene):
- slave.render_slave(self, scene.network_render)
+ slave.render_slave(self, scene.network_render, scene.render_data.threads)
def render_client(self, scene):
netsettings = scene.network_render