diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 10:05:02 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 10:05:02 +0300 |
commit | ca7f826c6f1812d38cd3a6985b5fc8de6e9de78c (patch) | |
tree | 878cdf3252cf23c3ef519aaf98e4a4a8d6770724 /source/blender/blenlib | |
parent | b8b8669b282da70f4db2a89203adee014a98b204 (diff) | |
parent | 58ba89b5bec5a2b7b74ef93fe18f0a3811cb48db (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_hash.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_base_inline.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h index 8b797820722..fa79481e25c 100644 --- a/source/blender/blenlib/BLI_hash.h +++ b/source/blender/blenlib/BLI_hash.h @@ -65,7 +65,7 @@ BLI_INLINE unsigned int BLI_hash_int(unsigned int k) BLI_INLINE float BLI_hash_int_01(unsigned int k) { - return (float)BLI_hash_int(k) * (1.0f/(float)0xFFFFFFFF); + return (float)BLI_hash_int(k) * (1.0f / (float)0xFFFFFFFF); } #endif // __BLI_HASH_H__ diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index 144198f2c06..1f517471407 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -333,7 +333,8 @@ MINLINE float clamp_f(float value, float min, float max) { if (value > max) { return max; - } else if (value < min) { + } + else if (value < min) { return min; } return value; |