diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-04-23 05:12:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-04-23 05:12:34 +0300 |
| commit | b785feb3d71fe9eb90a67ccdce06a57b84d69ec1 (patch) | |
| tree | aa4940b82d4632d04b8d7a6a385cc00fe83a2bb7 /intern | |
| parent | 101ec2f3b814b6cc03e550ca0d0987d11b0847ca (diff) | |
| parent | e812512e1d15125f5fc13aea27c173cde3a06470 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_avxb.h | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_avxi.h | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_ssei.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/util_avxb.h index 34fafd188de..5c03b1d88d7 100644 --- a/intern/cycles/util/util_avxb.h +++ b/intern/cycles/util/util_avxb.h @@ -57,7 +57,7 @@ struct avxb { : m256(_mm256_insertf128_ps(_mm256_castps128_ps256(a), b, 1)) { } - __forceinline operator const __m256 &(void)const + __forceinline operator const __m256 &(void) const { return m256; } diff --git a/intern/cycles/util/util_avxi.h b/intern/cycles/util/util_avxi.h index e658a4f848f..1b3810764b7 100644 --- a/intern/cycles/util/util_avxi.h +++ b/intern/cycles/util/util_avxi.h @@ -54,7 +54,7 @@ struct avxi { __forceinline avxi(const __m256i a) : m256(a) { } - __forceinline operator const __m256i &(void)const + __forceinline operator const __m256i &(void) const { return m256; } diff --git a/intern/cycles/util/util_ssei.h b/intern/cycles/util/util_ssei.h index e2bf81310cc..a4db9193206 100644 --- a/intern/cycles/util/util_ssei.h +++ b/intern/cycles/util/util_ssei.h @@ -57,7 +57,7 @@ struct ssei { __forceinline ssei(const __m128i a) : m128(a) { } - __forceinline operator const __m128i &(void)const + __forceinline operator const __m128i &(void) const { return m128; } |