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>2019-04-17 09:16:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 09:17:13 +0300
commit108045faa01849115c54190ebed788faf36dcb56 (patch)
tree64d024b47b0dcb6850108377c55e96917645efe5 /intern/cycles/util
parent3076d95ba441cd32706a27d18922a30f8fd28b8a (diff)
ClangFormat: format '#if 0' code in intern/
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_math.h4
-rw-r--r--intern/cycles/util/util_transform.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 2c7f826db93..92cab29346a 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -417,12 +417,12 @@ ccl_device_inline float triangle_area(const float3 v1, const float3 v2, const fl
ccl_device_inline void make_orthonormals(const float3 N, float3 *a, float3 *b)
{
#if 0
- if(fabsf(N.y) >= 0.999f) {
+ if (fabsf(N.y) >= 0.999f) {
*a = make_float3(1, 0, 0);
*b = make_float3(0, 0, 1);
return;
}
- if(fabsf(N.z) >= 0.999f) {
+ if (fabsf(N.z) >= 0.999f) {
*a = make_float3(1, 0, 0);
*b = make_float3(0, 1, 0);
return;
diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h
index 13ca27c2fed..cfe71d696ed 100644
--- a/intern/cycles/util/util_transform.h
+++ b/intern/cycles/util/util_transform.h
@@ -328,11 +328,11 @@ ccl_device_inline float4 quat_interpolate(float4 q1, float4 q2, float t)
/* possible optimization: it might be possible to precompute theta/qperp */
- if(costheta > 0.9995f) {
+ if (costheta > 0.9995f) {
/* linear interpolation in degenerate case */
- return normalize((1.0f - t)*q1 + t*q2);
+ return normalize((1.0f - t) * q1 + t * q2);
}
- else {
+ else {
/* slerp */
float theta = acosf(clamp(costheta, -1.0f, 1.0f));
float4 qperp = normalize(q2 - q1 * costheta);