From 2d81cef598ca31658a8f4c44b11a80e88f5f7a58 Mon Sep 17 00:00:00 2001 From: Gottfried Hofmann Date: Mon, 5 Sep 2016 15:40:50 +0200 Subject: Fix T46042: Netrender: Slave continues to render frames after cancellation by job manager. To be backported to 2.78. --- netrender/slave.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'netrender') diff --git a/netrender/slave.py b/netrender/slave.py index 40b62ddf..c20906a5 100644 --- a/netrender/slave.py +++ b/netrender/slave.py @@ -322,9 +322,6 @@ def render_slave(engine, netsettings, threads): if job.type == netrender.model.JOB_BLENDER: netrender.repath.reset(job) - # read leftovers if needed - data.stdout += process.stdout.read() - if data.cancelled: # kill process if needed if process.poll() is None: @@ -334,6 +331,9 @@ def render_slave(engine, netsettings, threads): pass continue # to next frame + # read leftovers if needed + data.stdout += process.stdout.read() + # flush the rest of the logs if data.stdout: stdout_text = str(data.stdout, encoding='utf8') -- cgit v1.2.3