[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25843] trunk/blender/release/scripts/io/ netrender: netrender: bugfix to make thumbnails work correctly when running master through the UI (not in background) [context is borked in that case].

[Martin Poirier]

Revision: 25843
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25843
Author:   theeth
Date:     2010-01-08 18:52:21 +0100 (Fri, 08 Jan 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/release/scripts/io/netrender/client.py
    trunk/blender/release/scripts/io/netrender/master.py
    trunk/blender/release/scripts/io/netrender/slave.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	2010-01-08 17:50:55 UTC (rev 25842)
+++ trunk/blender/release/scripts/io/netrender/client.py	2010-01-08 17:52:21 UTC (rev 25843)
@@ -201,7 +201,7 @@
 
 
     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

Modified: trunk/blender/release/scripts/io/netrender/master.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/master.py	2010-01-08 17:50:55 UTC (rev 25842)
+++ trunk/blender/release/scripts/io/netrender/master.py	2010-01-08 17:52:21 UTC (rev 25843)
@@ -257,7 +257,7 @@
                                     sce.render_data.quality = 90
                                     bpy.ops.image.open(path = job.save_path + "%04d" % frame_number + ".exr")
                                     img = bpy.data.images["%04d" % frame_number + ".exr"]
-                                    img.save(filename)
+                                    img.save(filename, scene = sce)
                                     
                                     try:
                                         process = subprocess.Popen(["convert", filename, "-resize", "300x300", filename])

Modified: trunk/blender/release/scripts/io/netrender/slave.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/slave.py	2010-01-08 17:50:55 UTC (rev 25842)
+++ trunk/blender/release/scripts/io/netrender/slave.py	2010-01-08 17:52:21 UTC (rev 25843)
@@ -88,7 +88,7 @@
 
     return job_full_path
 
-def render_slave(engine, netsettings):
+def render_slave(engine, netsettings, threads):
     timeout = 1
 
     engine.update_stats("", "Network render node initiation")
@@ -151,7 +151,7 @@
                         frame_args += ["-f", str(frame.number)]
 
                     val = SetErrorMode()
-                    process = subprocess.Popen([BLENDER_PATH, "-b", "-noaudio", job_full_path, "-o", JOB_PREFIX + "######", "-E", "BLENDER_RENDER", "-F", "MULTILAYER"] + frame_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                    process = subprocess.Popen([BLENDER_PATH, "-b", "-noaudio", job_full_path, "-t", str(threads), "-o", JOB_PREFIX + "######", "-E", "BLENDER_RENDER", "-F", "MULTILAYER"] + frame_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
                     RestoreErrorMode(val)
                 elif job.type == netrender.model.JOB_PROCESS:
                     command = job.frames[0].command
@@ -165,7 +165,7 @@
                 stdout = bytes()
                 run_t = time.time()
                 while not cancelled and process.poll() == None:
-                    stdout += process.stdout.read(32)
+                    stdout += process.stdout.read(1024)
                     current_t = time.time()
                     cancelled = engine.test_break()
                     if current_t - run_t > CANCEL_POLL_SPEED:

Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py	2010-01-08 17:50:55 UTC (rev 25842)
+++ trunk/blender/release/scripts/io/netrender/ui.py	2010-01-08 17:52:21 UTC (rev 25843)
@@ -136,10 +136,15 @@
         layout = self.layout
 
         scene = context.scene
+        rd = scene.render_data
         netsettings = scene.network_render
 
         layout.prop(netsettings, "slave_clear")
-        
+        layout.label(text="Threads:")
+        layout.prop(rd, "threads_mode", expand=True)
+        sub = layout.column()
+        sub.enabled = rd.threads_mode == 'THREADS_FIXED'
+        sub.prop(rd, "threads")        
 @rnaType
 class RENDER_PT_network_master_settings(RenderButtonsPanel):
     bl_label = "Master Settings"