diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-22 11:18:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-22 11:21:05 +0300 |
| commit | bd935b5aed202e37084cb4952b4efd2dace2bfe7 (patch) | |
| tree | 57722f5b2350905a80ce77ed41c023a233776571 /intern/cycles/blender/blender_python.cpp | |
| parent | ccff7c3c828ec81c740fe0e0cde0011d27e30021 (diff) | |
| parent | 691ed21842397e52445fa8368fa81d757ba66123 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_python.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_python.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 772ce1d555e..300ccc06ea9 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"); |