diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-30 18:40:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-30 18:40:06 +0300 |
| commit | af21053087b93c015435a62cbedade03772c52c7 (patch) | |
| tree | e45e772130da677e41a4ce923d4842bdd963ed15 /intern | |
| parent | b491577cb7e43b4c219559645fe5ae92490422df (diff) | |
| parent | 94ea566b5a185bd99c57eeaad974253896e0041c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_debug.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index b19e33c3590..4989746ae6a 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -638,7 +638,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene, /* TODO(sergey): Once OSL supports per-microarchitecture optimization get * rid of this. */ - if (params.shadingsystem == SHADINGSYSTEM_OSL) { + if(params.shadingsystem == SHADINGSYSTEM_OSL) { params.bvh_layout = BVH_LAYOUT_BVH4; } else { diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 5b3761f8353..7c72ab1a009 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -1031,7 +1031,7 @@ void device_cpu_info(vector<DeviceInfo>& devices) if(system_cpu_support_sse2()) { info.bvh_layout_mask |= BVH_LAYOUT_BVH4; } - if (system_cpu_support_avx2()) { + if(system_cpu_support_avx2()) { info.bvh_layout_mask |= BVH_LAYOUT_BVH8; } info.has_volume_decoupled = true; diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp index a761c9c46de..68e6f261057 100644 --- a/intern/cycles/util/util_debug.cpp +++ b/intern/cycles/util/util_debug.cpp @@ -57,13 +57,13 @@ void DebugFlags::CPU::reset() #undef STRINGIFY #undef CHECK_CPU_FLAGS - if (getenv("CYCLES_BVH2") != NULL) { + if(getenv("CYCLES_BVH2") != NULL) { bvh_layout = BVH_LAYOUT_BVH2; } - else if (getenv("CYCLES_BVH4") != NULL) { + else if(getenv("CYCLES_BVH4") != NULL) { bvh_layout = BVH_LAYOUT_BVH4; } - else if (getenv("CYCLES_BVH8") != NULL) { + else if(getenv("CYCLES_BVH8") != NULL) { bvh_layout = BVH_LAYOUT_BVH8; } else { |