diff options
| author | Gottfried Hofmann <accounts@blenderdiplom.com> | 2016-09-05 16:40:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-14 11:22:01 +0300 |
| commit | 196d4061c9ac8ba7411eff48b25ec4bb0904fade (patch) | |
| tree | 4eafb9e1dc0a81e5f49e82fe754fab764d3b02d1 | |
| parent | 06dad53c80801e0e0919f086040e3d9c31bbd0a1 (diff) | |
Fix T46042: Netrender: Slave continues to render frames after cancellation by job manager.
To be backported to 2.78.
| -rw-r--r-- | netrender/slave.py | 6 |
1 files changed, 3 insertions, 3 deletions
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') |