Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGottfried Hofmann <accounts@blenderdiplom.com>2016-09-05 16:40:50 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-09-05 16:41:42 +0300
commit2d81cef598ca31658a8f4c44b11a80e88f5f7a58 (patch)
tree7ec61a9d44947f84f4cdbfff5eeaa5f04f9d3221 /netrender
parentf228617198f216940c5fcf938a727cee25561855 (diff)
Fix T46042: Netrender: Slave continues to render frames after cancellation by job manager.
To be backported to 2.78.
Diffstat (limited to 'netrender')
-rw-r--r--netrender/slave.py6
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')