diff options
| author | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
|---|---|---|
| committer | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
| commit | 6594fa1ce02809a275c9cd488fa0223d03d73571 (patch) | |
| tree | 0bcd95846e1e3b09239126b40ef434ed3dc3a50d /intern/cycles/blender/blender_python.cpp | |
| parent | f2017083a19e5c83aadc575625dce0642ffce6c5 (diff) | |
merged the master branchsoc-2017-vertex_paint
Diffstat (limited to 'intern/cycles/blender/blender_python.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_python.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 01570b1e3f9..e268c9a0d35 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -60,6 +60,8 @@ bool debug_flags_sync_from_scene(BL::Scene b_scene) /* Backup some settings for comparison. */ DebugFlags::OpenCL::DeviceType opencl_device_type = flags.opencl.device_type; DebugFlags::OpenCL::KernelType opencl_kernel_type = flags.opencl.kernel_type; + /* Synchronize shared flags. */ + flags.viewport_static_bvh = get_enum(cscene, "debug_bvh_type"); /* Synchronize CPU flags. */ flags.cpu.avx2 = get_boolean(cscene, "debug_use_cpu_avx2"); flags.cpu.avx = get_boolean(cscene, "debug_use_cpu_avx"); @@ -106,6 +108,7 @@ 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 || flags.opencl.kernel_type != opencl_kernel_type; |