Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / blender_python.cpp
index 3438a3512ca9a0d50a27cf0a88ba73022e8cd629..9ade27d57d76aab7b3895ae6e00b74cb9c7502bd 100644 (file)
@@ -69,7 +69,7 @@ bool debug_flags_sync_from_scene(BL::Scene b_scene)
        flags.cpu.sse41 = get_boolean(cscene, "debug_use_cpu_sse41");
        flags.cpu.sse3 = get_boolean(cscene, "debug_use_cpu_sse3");
        flags.cpu.sse2 = get_boolean(cscene, "debug_use_cpu_sse2");
        flags.cpu.sse41 = get_boolean(cscene, "debug_use_cpu_sse41");
        flags.cpu.sse3 = get_boolean(cscene, "debug_use_cpu_sse3");
        flags.cpu.sse2 = get_boolean(cscene, "debug_use_cpu_sse2");
-       flags.cpu.qbvh = get_boolean(cscene, "debug_use_qbvh");
+       flags.cpu.bvh_layout = (BVHLayout)get_enum(cscene, "debug_bvh_layout");
        flags.cpu.split_kernel = get_boolean(cscene, "debug_use_cpu_split_kernel");
        /* Synchronize CUDA flags. */
        flags.cuda.adaptive_compile = get_boolean(cscene, "debug_use_cuda_adaptive_compile");
        flags.cpu.split_kernel = get_boolean(cscene, "debug_use_cpu_split_kernel");
        /* Synchronize CUDA flags. */
        flags.cuda.adaptive_compile = get_boolean(cscene, "debug_use_cuda_adaptive_compile");