From e88bae64e61736b695442e434d50f41b1c8f7e8f Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 18 Apr 2012 01:45:43 +0000
Subject: [PATCH] netrender
baking and render options for tags on slaves (default true for both means a slave can do all jobs by default)
---
netrender/slave.py | 7 +++++++
netrender/ui.py | 12 ++++++++++++
2 files changed, 19 insertions(+)
diff --git a/netrender/slave.py b/netrender/slave.py
index d8d82e8dd..c3b1f1136 100644
--- a/netrender/slave.py
+++ b/netrender/slave.py
@@ -46,6 +46,13 @@ def slave_Info(netsettings):
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):
diff --git a/netrender/ui.py b/netrender/ui.py
index f1d6283da..fbf17c8d4 100644
--- a/netrender/ui.py
+++ b/netrender/ui.py
@@ -164,6 +164,8 @@ class RENDER_PT_network_slave_settings(NetRenderButtonsPanel, bpy.types.Panel):
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 @@ class NetRenderSettings(bpy.types.PropertyGroup):
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",
--
GitLab