diff options
| author | Joshua Leung <aligorith@gmail.com> | 2018-03-20 06:13:37 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2018-03-20 06:13:37 +0300 |
| commit | c8a7c4f245391717f10ed4d67e38d955b64a6f44 (patch) | |
| tree | 4e64328a93ee3797fed5e3e34031a0be3885a22e /source/blender/blenlib | |
| parent | 84536d1d3ce217a44877acdc9845254249c040ce (diff) | |
| parent | 8e5c407fc446b35042c626e7d60ff9a2336093f4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/math_base_inline.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index eed06c7841b..1f517471407 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -368,8 +368,10 @@ MINLINE int compare_ff_relative(float a, float b, const float max_diff, const in { union {float f; int i;} ua, ub; +#if 0 /* No BLI_assert in INLINE :/ */ BLI_assert(sizeof(float) == sizeof(int)); BLI_assert(max_ulps < (1 << 22)); +#endif if (fabsf(a - b) <= max_diff) { return 1; |