[Bf-extensions-cvs] [196d406] blender-v2.78-release: Fix T46042: Netrender: Slave continues to render frames after cancellation by job manager.

Gottfried Hofmann noreply at git.blender.org
Wed Sep 14 10:23:11 CEST 2016


Commit: 196d4061c9ac8ba7411eff48b25ec4bb0904fade
Author: Gottfried Hofmann
Date:   Mon Sep 5 15:40:50 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rBA196d4061c9ac8ba7411eff48b25ec4bb0904fade

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

To be backported to 2.78.

===================================================================

M	netrender/slave.py

===================================================================

diff --git a/netrender/slave.py b/netrender/slave.py
index 40b62dd..c20906a 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')



More information about the Bf-extensions-cvs mailing list