diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-08-21 16:09:03 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-08-21 20:05:17 +0300 |
| commit | 296d74c4b11aafbeec84ee21c0feb5dc93590a3f (patch) | |
| tree | 492b52f90b657565cdc35034a5e8d643a3c6f2d6 /intern/cycles/blender/blender_sync.cpp | |
| parent | 81a76469ca05a47a7471f92be3e0e257107de141 (diff) | |
Cycles: reorganize Performance panel layout, move viewport BVH type to debug.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 2d5b151f256..42e3721883f 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -626,14 +626,10 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene, else if(shadingsystem == 1) params.shadingsystem = SHADINGSYSTEM_OSL; - if(background) + if(background || DebugFlags().viewport_static_bvh) params.bvh_type = SceneParams::BVH_STATIC; else - params.bvh_type = (SceneParams::BVHType)get_enum( - cscene, - "debug_bvh_type", - SceneParams::BVH_NUM_TYPES, - SceneParams::BVH_STATIC); + params.bvh_type = SceneParams::BVH_DYNAMIC; params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits"); params.use_bvh_unaligned_nodes = RNA_boolean_get(&cscene, "debug_use_hair_bvh"); |