From 252dff515fa4b045ac94655cdee0450627caf4f8 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Mon, 19 Dec 2011 20:36:52 +0000 Subject: [#29564] Patch to enable choice between BLENDER_RENDER and CYCLES [#29648] patch for netrender: correctly send smoke cache domain Both by Philippe Van Hecke Render engine support was expended to be able to specify non-builtin engines. --- netrender/slave.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'netrender/slave.py') diff --git a/netrender/slave.py b/netrender/slave.py index f31bddee..c7f3a8cb 100644 --- a/netrender/slave.py +++ b/netrender/slave.py @@ -238,7 +238,7 @@ def render_slave(engine, netsettings, threads): frame_args += ["-f", str(frame.number)] val = SetErrorMode() - process = subprocess.Popen([BLENDER_PATH, "-b", "-noaudio", job_full_path, "-t", str(threads), "-o", os.path.join(JOB_PREFIX, "######"), "-E", "BLENDER_RENDER", "-F", "MULTILAYER"] + frame_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + process = subprocess.Popen([BLENDER_PATH, "-b", "-noaudio", job_full_path, "-t", str(threads), "-o", os.path.join(JOB_PREFIX, "######"), "-E", job.render, "-F", "MULTILAYER"] + frame_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) RestoreErrorMode(val) elif job.type == netrender.model.JOB_PROCESS: command = job.frames[0].command @@ -272,6 +272,7 @@ def render_slave(engine, netsettings, threads): run_t = current_t if testCancel(conn, job.id, first_frame): + engine.update_stats("", "Job canceled by Master") cancelled = True if job.type == netrender.model.JOB_BLENDER: -- cgit v1.2.3