diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-03 06:55:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-03 06:56:34 +0400 |
commit | 1dc1d92dabe08fd78791ab02295c65adefdb61c8 (patch) | |
tree | cea2c3857deb2ca923f041a7e3acce2dc30a1777 /intern/cycles/util/util_transform.h | |
parent | 236e46835908f05a54e09cf2774386e5a8ef8be1 (diff) |
Code cleanup: white space and cmake was broken on all platforms
Diffstat (limited to 'intern/cycles/util/util_transform.h')
-rw-r--r-- | intern/cycles/util/util_transform.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h index 1b6315ba484..4c7ce12d1de 100644 --- a/intern/cycles/util/util_transform.h +++ b/intern/cycles/util/util_transform.h @@ -264,7 +264,7 @@ ccl_device_inline bool transform_uniform_scale(const Transform& tfm, float& scal /* the epsilon here is quite arbitrary, but this function is only used for * surface area and bump, where we except it to not be so sensitive */ Transform ttfm = transform_transpose(tfm); - float eps = 1e-6f; + float eps = 1e-6f; float sx = len_squared(float4_to_float3(tfm.x)); float sy = len_squared(float4_to_float3(tfm.y)); @@ -275,12 +275,13 @@ ccl_device_inline bool transform_uniform_scale(const Transform& tfm, float& scal if(fabsf(sx - sy) < eps && fabsf(sx - sz) < eps && fabsf(sx - stx) < eps && fabsf(sx - sty) < eps && - fabsf(sx - stz) < eps) { + fabsf(sx - stz) < eps) + { scale = sx; return true; } - - return false; + + return false; } ccl_device_inline bool transform_negative_scale(const Transform& tfm) |