[Bf-blender-cvs] [94ea566b5a1] master: Cycles: Cleanup, whitespace after keyword
Sergey Sharybin
noreply at git.blender.org
Thu Aug 30 17:34:24 CEST 2018
Commit: 94ea566b5a185bd99c57eeaad974253896e0041c
Author: Sergey Sharybin
Date: Thu Aug 30 17:34:11 2018 +0200
Branches: master
https://developer.blender.org/rB94ea566b5a185bd99c57eeaad974253896e0041c
Cycles: Cleanup, whitespace after keyword
===================================================================
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/device/device_cpu.cpp
M intern/cycles/util/util_debug.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index fcdadf0ad6e..5e47252e336 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -682,7 +682,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 {
More information about the Bf-blender-cvs
mailing list