diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 12:04:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 12:10:25 +0300 |
commit | a2929edf28e8638eff72ee57ed58e79bbab4b283 (patch) | |
tree | 63ca88a8eaa25cf9e0d3ef885165c3d16db73258 /intern/cycles/blender/addon/engine.py | |
parent | 75d69eab69307891f197ff1c93b8a7e4454cccf7 (diff) | |
parent | 0108ce1fe5b9b4f24b5bdce4924e9b058d0edfa3 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/addon/engine.py')
-rw-r--r-- | intern/cycles/blender/addon/engine.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index b689c750be0..5c52a8bcce9 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -82,15 +82,17 @@ def _parse_command_line(): if args.cycles_resumable_current_chunk is not None: import _cycles _cycles.set_resumable_chunk( - int(args.cycles_resumable_num_chunks), - int(args.cycles_resumable_current_chunk)) + int(args.cycles_resumable_num_chunks), + int(args.cycles_resumable_current_chunk), + ) elif args.cycles_resumable_start_chunk is not None and \ - args.cycles_resumable_end_chunk: + args.cycles_resumable_end_chunk: import _cycles _cycles.set_resumable_chunk_range( - int(args.cycles_resumable_num_chunks), - int(args.cycles_resumable_start_chunk), - int(args.cycles_resumable_end_chunk)) + int(args.cycles_resumable_num_chunks), + int(args.cycles_resumable_start_chunk), + int(args.cycles_resumable_end_chunk), + ) def init(): @@ -209,6 +211,7 @@ def system_info(): import _cycles return _cycles.system_info() + def register_passes(engine, scene, srl): engine.register_pass(scene, srl, "Combined", 4, "RGBA", 'COLOR') |