blender
/
blender-addons
17
33
Fork 92
Code Issues 526 Pull Requests 32 Projects 1 Releases Wiki Activity

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

To be backported to 2.78.
This commit is contained in:
Gottfried Hofmann 2016-09-05 15:40:50 +02:00 committed by Bastien Montagne
parent f228617198
commit 2d81cef598
Notes: blender-bot 2023-02-14 19:53:11 +01:00 
Referenced by issue #46042, NetRender: slave continues to render frames after the cancellation of the job on Manager
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netrender/slave.py
View File

@ -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')