diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 03:45:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 03:45:39 +0300 |
| commit | fc1fd2704a7b1cc448b20ed5cb596784cb764224 (patch) | |
| tree | 2b24db79955d2ac49e0d45d269cec0917a387cdc /intern/cycles/blender/blender_sync.cpp | |
| parent | 367e61117907bb7507935251ecb7e396a4c91cbc (diff) | |
| parent | bf7e4067663cec0a3b4d3194e89a28aa62b39773 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 870183aa1d6..08d76582f03 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -637,7 +637,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene, params.texture_limit = 0; } - params.use_qbvh = DebugFlags().cpu.qbvh; + params.bvh_layout = DebugFlags().cpu.bvh_layout; return params; } |