diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-09-15 23:53:18 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-09-15 23:53:18 +0400 |
| commit | 22274d38079f7e1e1e0bf24e777c333961ed18f7 (patch) | |
| tree | 849ef065632c6a3c32a5b84067b6f357e784d3e1 /release/io/netrender/ui.py | |
| parent | fd664970f17b71764753ffe3fb87388f40c91da2 (diff) | |
More automatic stuff.
Server can now be set to broadcast on local network (every 10s, approximately 20 bytes of data) where client and slave can pick up its existence. This is on by default.
Default ip address is now "[default]", which means for the master that it will listen to all interface and for the clients and slave that they will automatically work out the master's address from its broadcast.
Diffstat (limited to 'release/io/netrender/ui.py')
| -rw-r--r-- | release/io/netrender/ui.py | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/release/io/netrender/ui.py b/release/io/netrender/ui.py index eee95bdac19..df2b6288fb0 100644 --- a/release/io/netrender/ui.py +++ b/release/io/netrender/ui.py @@ -48,17 +48,24 @@ class SCENE_PT_network_settings(RenderButtonsPanel): col = split.column() - col.itemO("render.netclientanim", icon='ICON_RENDER_ANIMATION', text="Animaton on network") + if scene.network_render.mode == "RENDER_CLIENT": + col.itemO("render.netclientanim", icon='ICON_RENDER_ANIMATION', text="Animaton on network") + col.itemR(scene.network_render, "mode") + col.itemR(scene.network_render, "path") col.itemR(scene.network_render, "server_address") col.itemR(scene.network_render, "server_port") - col.itemR(scene.network_render, "path") + + if scene.network_render.mode == "RENDER_MASTER": + col.itemR(scene.network_render, "server_broadcast") + else: + col.itemO("render.netclientscan", icon="ICON_FILE_REFRESH", text="") if scene.network_render.mode == "RENDER_CLIENT": - col.itemR(scene.network_render, "chunks") - col.itemR(scene.network_render, "priority") - col.itemR(scene.network_render, "job_name") col.itemO("render.netclientsend", text="send job to server") + col.itemR(scene.network_render, "job_name") + col.itemR(scene.network_render, "priority") + col.itemR(scene.network_render, "chunks") @rnaType class SCENE_PT_network_slaves(RenderButtonsPanel): @@ -192,7 +199,7 @@ NetRenderSettings.StringProperty( attr="server_address", name="Server address", description="IP or name of the master render server", maxlen = 128, - default = "127.0.0.1") + default = "[default]") NetRenderSettings.IntProperty( attr="server_port", name="Server port", @@ -201,6 +208,11 @@ NetRenderSettings.IntProperty( attr="server_port", min=1, max=65535) +NetRenderSettings.BoolProperty( attr="server_broadcast", + name="Broadcast server address", + description="broadcast server address on local network", + default = True) + NetRenderSettings.StringProperty( attr="path", name="Path", description="Path for temporary files", |