Skip to content
Snippets Groups Projects
Commit 647f4a1e authored by Martin Poirier's avatar Martin Poirier
Browse files

[#25888] Netrender Blacklisting slaves

Report by Wintch Analyzer

Refill the rna blacklist list every refresh (safer that way).
parent 7a85385b
No related branches found
No related tags found
No related merge requests found
...@@ -311,6 +311,9 @@ class RENDER_OT_netclientslaves(bpy.types.Operator): ...@@ -311,6 +311,9 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
slaves = (netrender.model.RenderSlave.materialize(s) for s in json.loads(str(content, encoding='utf8'))) slaves = (netrender.model.RenderSlave.materialize(s) for s in json.loads(str(content, encoding='utf8')))
while(len(netsettings.slaves_blacklist) > 0):
netsettings.slaves_blacklist.remove(0)
while(len(netsettings.slaves) > 0): while(len(netsettings.slaves) > 0):
netsettings.slaves.remove(0) netsettings.slaves.remove(0)
...@@ -321,7 +324,9 @@ class RENDER_OT_netclientslaves(bpy.types.Operator): ...@@ -321,7 +324,9 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
slave = netrender.blacklist[i] slave = netrender.blacklist[i]
if slave.id == s.id: if slave.id == s.id:
netrender.blacklist[i] = s netrender.blacklist[i] = s
netsettings.slaves_blacklist[i].name = s.name netsettings.slaves_blacklist.add()
slave = netsettings.slaves_blacklist[-1]
slave.name = s.name
break break
else: else:
netrender.slaves.append(s) netrender.slaves.append(s)
...@@ -498,6 +503,7 @@ class netclientscan(bpy.types.Operator): ...@@ -498,6 +503,7 @@ class netclientscan(bpy.types.Operator):
netsettings = scene.network_render netsettings = scene.network_render
netsettings.server_address = address netsettings.server_address = address
netsettings.server_port = port netsettings.server_port = port
netrender.valid_address = True
return {'FINISHED'} return {'FINISHED'}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment