diff options
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_string.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_transform.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/util/util_string.cpp b/intern/cycles/util/util_string.cpp index 61a16b63351..f38d8d3282f 100644 --- a/intern/cycles/util/util_string.cpp +++ b/intern/cycles/util/util_string.cpp @@ -93,7 +93,7 @@ bool string_endswith(const string& s, const char *end) if(len > s.size()) return 0; else - return strncmp(s.c_str() + s.size() - len, end, len) == 0; + return strncmp(s.c_str() + s.size() - len, end, len) == 0; } string string_strip(const string& s) 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) |