Skip to content
Snippets Groups Projects
Commit 2d81cef5 authored by Gottfried Hofmann's avatar Gottfried Hofmann Committed by Bastien Montagne
Browse files

Fix T46042: Netrender: Slave continues to render frames after cancellation by job manager.

To be backported to 2.78.
parent f2286171
Branches
No related tags found
No related merge requests found
...@@ -322,9 +322,6 @@ def render_slave(engine, netsettings, threads): ...@@ -322,9 +322,6 @@ def render_slave(engine, netsettings, threads):
if job.type == netrender.model.JOB_BLENDER: if job.type == netrender.model.JOB_BLENDER:
netrender.repath.reset(job) netrender.repath.reset(job)
# read leftovers if needed
data.stdout += process.stdout.read()
if data.cancelled: if data.cancelled:
# kill process if needed # kill process if needed
if process.poll() is None: if process.poll() is None:
...@@ -334,6 +331,9 @@ def render_slave(engine, netsettings, threads): ...@@ -334,6 +331,9 @@ def render_slave(engine, netsettings, threads):
pass pass
continue # to next frame continue # to next frame
# read leftovers if needed
data.stdout += process.stdout.read()
# flush the rest of the logs # flush the rest of the logs
if data.stdout: if data.stdout:
stdout_text = str(data.stdout, encoding='utf8') stdout_text = str(data.stdout, encoding='utf8')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment