Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-06-30 12:46:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-30 13:50:37 +0300
commit84f8b47c4c44160de5f59cea9da82d70755209e5 (patch)
tree341991ff1374739a5b7278102a5c350dbcbb5ed0 /intern/cycles
parent029103907937566c3cc2d3fd058e22a7040c6d1c (diff)
Cleanup: clang-format
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/render/geometry.cpp2
-rw-r--r--intern/cycles/util/util_math_fast.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 3e18661ecf7..3d1b6e1d865 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1413,7 +1413,7 @@ void GeometryManager::device_free(Device *device, DeviceScene *dscene)
if (dscene->data.bvh.bvh_layout == BVH_LAYOUT_EMBREE)
BVHEmbree::destroy(dscene->data.bvh.scene);
dscene->data.bvh.scene = NULL;
- }
+ }
#endif
dscene->bvh_nodes.free();
diff --git a/intern/cycles/util/util_math_fast.h b/intern/cycles/util/util_math_fast.h
index 1e0792859a2..e505c60781e 100644
--- a/intern/cycles/util/util_math_fast.h
+++ b/intern/cycles/util/util_math_fast.h
@@ -446,11 +446,11 @@ ccl_device_inline float fast_expf(float x)
}
#ifndef __KERNEL_GPU__
-/* MSVC seems to have a codegen bug here in atleast SSE41/AVX
+/* MSVC seems to have a codegen bug here in atleast SSE41/AVX
* see T78047 for details. */
-#ifdef _MSC_VER
-# pragma optimize( "", off )
-#endif
+# ifdef _MSC_VER
+# pragma optimize("", off)
+# endif
ccl_device float4 fast_exp2f4(float4 x)
{
const float4 one = make_float4(1.0f);
@@ -466,9 +466,9 @@ ccl_device float4 fast_exp2f4(float4 x)
r = madd4(x, r, make_float4(1.0f));
return __int4_as_float4(__float4_as_int4(r) + (m << 23));
}
-#ifdef _MSC_VER
-# pragma optimize( "", on )
-#endif
+# ifdef _MSC_VER
+# pragma optimize("", on)
+# endif
ccl_device_inline float4 fast_expf4(float4 x)
{