diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-05-24 09:27:01 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-05-24 09:27:01 +0300 |
| commit | 5ee965eea59b3e4895edf49cb7a07dec563395f5 (patch) | |
| tree | c45ef54432858228422aa326526a4754e1a9a52f /source/blender/blenlib | |
| parent | 6f20fcd5984a47baee9ff440e9e59584fccd1e59 (diff) | |
| parent | d78894eb3e1bffd05eaa9b7a6dc322923d5cf7c1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/math_base_inline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index 268279f98b1..0f282805e71 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -513,6 +513,8 @@ MALWAYS_INLINE __m128 _bli_math_blend_sse(const __m128 mask, return _mm_or_ps(_mm_and_ps(mask, a), _mm_andnot_ps(mask, b)); } +#endif /* __SSE2__ */ + /* Low level conversion functions */ MINLINE unsigned char unit_float_to_uchar_clamp(float val) { @@ -544,6 +546,4 @@ MINLINE unsigned char unit_ushort_to_uchar(unsigned short val) (v1)[3] = unit_float_to_uchar_clamp((v2[3])); \ } ((void)0) -#endif /* __SSE2__ */ - #endif /* __MATH_BASE_INLINE_C__ */ |