griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Netrender cleanup and bug fix

Browse Source 
Blacklist and linked files work again

Store temp data in module
This commit is contained in:
Martin Poirier
2009-11-18 18:00:46 +00:00
parent b5797272d0
commit a73be8097d
5 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
release/scripts/io/netrender/operators.py
View File

@@ -21,6 +21,7 @@ import sys, os
import http, http.client, http.server, urllib, socket
import webbrowser
import netrender
from netrender.utils import *
import netrender.client as client
import netrender.model
@@ -101,10 +102,10 @@ class RENDER_OT_netclientstatus(bpy.types.Operator):
while(len(netsettings.jobs) > 0):
netsettings.jobs.remove(0)
bpy.netrender_jobs = []
netrender.jobs = []
for j in jobs:
bpy.netrender_jobs.append(j)
netrender.jobs.append(j)
netsettings.jobs.add()
job = netsettings.jobs[-1]
@@ -132,8 +133,8 @@ class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
if netsettings.active_slave_index >= 0:
# deal with data
slave = bpy.netrender_slaves.pop(netsettings.active_slave_index)
bpy.netrender_blacklist.append(slave)
slave = netrender.slaves.pop(netsettings.active_slave_index)
netrender.blacklist.append(slave)
# deal with rna
netsettings.slaves_blacklist.add()
@@ -162,8 +163,8 @@ class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
if netsettings.active_blacklisted_slave_index >= 0:
# deal with data
slave = bpy.netrender_blacklist.pop(netsettings.active_blacklisted_slave_index)
bpy.netrender_slaves.append(slave)
slave = netrender.blacklist.pop(netsettings.active_blacklisted_slave_index)
netrender.slaves.append(slave)
# deal with rna
netsettings.slaves.add()
@@ -202,17 +203,17 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
while(len(netsettings.slaves) > 0):
netsettings.slaves.remove(0)
bpy.netrender_slaves = []
netrender.slaves = []
for s in slaves:
for i in range(len(bpy.netrender_blacklist)):
slave = bpy.netrender_blacklist[i]
for i in range(len(netrender.blacklist)):
slave = netrender.blacklist[i]
if slave.id == s.id:
bpy.netrender_blacklist[i] = s
netrender.blacklist[i] = s
netsettings.slaves_blacklist[i].name = s.name
break
else:
bpy.netrender_slaves.append(s)
netrender.slaves.append(s)
netsettings.slaves.add()
slave = netsettings.slaves[-1]
@@ -238,7 +239,7 @@ class RENDER_OT_netclientcancel(bpy.types.Operator):
conn = clientConnection(netsettings.server_address, netsettings.server_port)
if conn:
job = bpy.netrender_jobs[netsettings.active_job_index]
job = netrender.jobs[netsettings.active_job_index]
conn.request("POST", "/cancel", headers={"job-id":job.id})
@@ -296,7 +297,7 @@ class netclientdownload(bpy.types.Operator):
conn = clientConnection(netsettings.server_address, netsettings.server_port)
if conn:
job = bpy.netrender_jobs[netsettings.active_job_index]
job = netrender.jobs[netsettings.active_job_index]
for frame in job.frames:
client.requestResult(conn, job.id, frame.number)