diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
| commit | 40412499433ef6d8619fd1e8ecaa00addb163721 (patch) | |
| tree | 17f9e5f936237cb4714f5ef0361f09dd0435db92 /intern/cycles/blender/blender_python.cpp | |
| parent | ba4d07cc5c74e42445a59bf1e77587cbf4a83482 (diff) | |
| parent | 0a28bb14222c7753a987256a9c155b670137ee37 (diff) | |
Merge branch 'blender2.7'
Conflicts:
intern/cycles/blender/addon/properties.py
intern/cycles/device/opencl/opencl_split.cpp
Diffstat (limited to 'intern/cycles/blender/blender_python.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_python.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 6cff4c0745c..4a1eeeb65c1 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -104,7 +104,6 @@ bool debug_flags_sync_from_scene(BL::Scene b_scene) /* Synchronize other OpenCL flags. */ flags.opencl.debug = get_boolean(cscene, "debug_use_opencl_debug"); flags.opencl.mem_limit = ((size_t)get_int(cscene, "debug_opencl_mem_limit"))*1024*1024; - flags.opencl.single_program = get_boolean(cscene, "debug_opencl_kernel_single_program"); return flags.opencl.device_type != opencl_device_type; } |