diff options
| author | Martin Poirier <theeth@yahoo.com> | 2011-12-20 00:36:52 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2011-12-20 00:36:52 +0400 |
| commit | 252dff515fa4b045ac94655cdee0450627caf4f8 (patch) | |
| tree | 15545d30f84bf42982ac2c865ad349873eec885e /netrender/slave.py | |
| parent | dbe3331a31fa8391e70f79f6bf4743b8f669bf88 (diff) | |
[#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.
Diffstat (limited to 'netrender/slave.py')
| -rw-r--r-- | netrender/slave.py | 3 |
1 files changed, 2 insertions, 1 deletions
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: |