bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

[#24123] Network render gives black images

Browse Source 
Error with buffer handling when reading response.

Also fix bug with blendfile relative path (wasn't converting them properly).
This commit is contained in:
Martin Poirier 2010-10-05 23:14:31 +00:00
parent eef0ffe9be
commit 70def5c247
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
release/scripts/io/netrender/client.py
View File

@ -211,7 +211,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
address = "" if netsettings.server_address == "[default]" else netsettings.server_address
master.runMaster((address, netsettings.server_port), netsettings.use_master_broadcast, netsettings.use_master_clear, netsettings.path, self.update_stats, self.test_break)
master.runMaster((address, netsettings.server_port), netsettings.use_master_broadcast, netsettings.use_master_clear, bpy.path.abspath(netsettings.path), self.update_stats, self.test_break)
def render_slave(self, scene):
@ -236,10 +236,11 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
# reading back result
self.update_stats("", "Network render waiting for results")
requestResult(conn, job_id, scene.frame_current)
response = conn.getresponse()
response.read()
buf = response.read()
if response.status == http.client.NO_CONTENT:
new_job = True
@ -248,13 +249,13 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
requestResult(conn, job_id, scene.frame_current)
response = conn.getresponse()
response.read()
buf = response.read()
while response.status == http.client.ACCEPTED and not self.test_break():
time.sleep(1)
requestResult(conn, job_id, scene.frame_current)
response = conn.getresponse()
response.read()
buf = response.read()
# cancel new jobs (animate on network) on break
if self.test_break() and new_job:
@ -271,18 +272,22 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
r = scene.render
x= int(r.resolution_x*r.resolution_percentage*0.01)
y= int(r.resolution_y*r.resolution_percentage*0.01)
result_path = os.path.join(bpy.path.abspath(netsettings.path), "output.exr")
folder = os.path.split(result_path)[0]
if not os.path.exists(folder):
os.mkdir(folder)
f = open(os.path.join(netsettings.path, "output.exr"), "wb")
buf = response.read(1024)
f = open(result_path, "wb")
while buf:
f.write(buf)
buf = response.read(1024)
f.write(buf)
f.close()
result = self.begin_result(0, 0, x, y)
result.load_from_file(os.path.join(netsettings.path, "output.exr"))
result.load_from_file(result_path)
self.end_result(result)
conn.close()

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

@ -417,7 +417,7 @@ class netclientdownload(bpy.types.Operator):
for frame in job.frames:
client.requestResult(conn, job.id, frame.number)
response = conn.getresponse()
response.read()
buf = response.read()
if response.status != http.client.OK:
print("missing", frame.number)
@ -425,12 +425,9 @@ class netclientdownload(bpy.types.Operator):
print("got back", frame.number)
f = open(os.path.join(netsettings.path, "%06d.exr" % frame.number), "wb")
buf = response.read(1024)
f = open(os.path.join(bpy.path.abspath(netsettings.path), "%06d.exr" % frame.number), "wb")
while buf:
f.write(buf)
buf = response.read(1024)
f.write(buf)
f.close()

4
release/scripts/io/netrender/slave.py
View File

@ -21,6 +21,8 @@ import http, http.client, http.server, urllib
import subprocess, time
import json
import bpy
from netrender.utils import *
import netrender.model
import netrender.repath
@ -118,7 +120,7 @@ def render_slave(engine, netsettings, threads):
slave_id = response.getheader("slave-id")
NODE_PREFIX = os.path.join(netsettings.path, "slave_" + slave_id)
NODE_PREFIX = os.path.join(bpy.path.abspath(netsettings.path), "slave_" + slave_id)
if not os.path.exists(NODE_PREFIX):
os.mkdir(NODE_PREFIX)