diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:27:41 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:30:09 +0300 |
| commit | 9d0eac6ba5efe1b3712152c337fb171a771a8921 (patch) | |
| tree | 8d51f1b3800513d37211253cc3f93f6c2a929ca4 /intern/cycles/blender/blender_sync.cpp | |
| parent | 0c8aa85069fabd20d5f030f016a85ad060839066 (diff) | |
| parent | d3dd3739f6fe1ba640cdcad12d6bf4da6b356c59 (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 1a3d94b5276..33c45de8d70 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -687,6 +687,9 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene, params.bvh_layout = DebugFlags().cpu.bvh_layout; } +#ifdef WITH_EMBREE + params.bvh_layout = RNA_boolean_get(&cscene, "use_bvh_embree") ? BVH_LAYOUT_EMBREE : params.bvh_layout; +#endif return params; } |