[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3274] trunk/py/scripts/addons/ netrender: netrender

[Martin Poirier]

Revision: 3274
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3274
Author:   theeth
Date:     2012-04-18 01:45:43 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
netrender

baking and render options for tags on slaves (default true for both means a slave can do all jobs by default)

Modified Paths:
--------------
    trunk/py/scripts/addons/netrender/slave.py
    trunk/py/scripts/addons/netrender/ui.py

Modified: trunk/py/scripts/addons/netrender/slave.py
===================================================================
--- trunk/py/scripts/addons/netrender/slave.py	2012-04-16 18:06:47 UTC (rev 3273)
+++ trunk/py/scripts/addons/netrender/slave.py	2012-04-18 01:45:43 UTC (rev 3274)
@@ -46,6 +46,13 @@
     slave.stats = sysname + " " + release + " " + machine + " " + processor
     if netsettings.slave_tags:
         slave.tags = set(netsettings.slave_tags.split(";"))
+    
+    if netsettings.slave_bake:
+        slave.tags.add(netrender.model.TAG_BAKING)
+    
+    if netsettings.slave_render:
+        slave.tags.add(netrender.model.TAG_RENDER)
+        
     return slave
 
 def testCancel(conn, job_id, frame_number):

Modified: trunk/py/scripts/addons/netrender/ui.py
===================================================================
--- trunk/py/scripts/addons/netrender/ui.py	2012-04-16 18:06:47 UTC (rev 3273)
+++ trunk/py/scripts/addons/netrender/ui.py	2012-04-18 01:45:43 UTC (rev 3274)
@@ -164,6 +164,8 @@
         netsettings = context.scene.network_render
 
         layout.prop(netsettings, "slave_tags", text="Tags")
+        layout.prop(netsettings, "slave_render")
+        layout.prop(netsettings, "slave_bake")
         layout.prop(netsettings, "use_slave_clear")
         layout.prop(netsettings, "use_slave_thumb")
         layout.prop(netsettings, "use_slave_output_log")
@@ -450,6 +452,16 @@
                         description="Output render text log to console as well as sending it to the master",
                         default = True)
         
+        NetRenderSettings.slave_render = BoolProperty(
+                        name="Render on slave",
+                        description="Use slave for render jobs",
+                        default = True)
+
+        NetRenderSettings.slave_bake = BoolProperty(
+                        name="Bake on slave",
+                        description="Use slave for baking jobs",
+                        default = True)
+
         NetRenderSettings.use_master_clear = BoolProperty(
                         name="Clear on exit",
                         description="Delete saved files on exit",