[Bf-blender-cvs] [3db67fd6705] master: Revert "Cleanup: Cycles, applied Clang-Format"

Sybren A. Stüvel noreply at git.blender.org
Fri Aug 7 13:48:45 CEST 2020


Commit: 3db67fd670535c0a709ec6e8204fcb730cd3eb0d
Author: Sybren A. Stüvel
Date:   Fri Aug 7 13:37:29 2020 +0200
Branches: master
https://developer.blender.org/rB3db67fd670535c0a709ec6e8204fcb730cd3eb0d

Revert "Cleanup: Cycles, applied Clang-Format"

This reverts commit 88cc3f167f7ee404640289ed9cfd6b13f0494d98. It was
caused by running Clang-Format version 10, instead of 9 from the
precompiled libs directory.

===================================================================

M	intern/cycles/util/util_avxb.h
M	intern/cycles/util/util_avxi.h
M	intern/cycles/util/util_sseb.h
M	intern/cycles/util/util_ssei.h

===================================================================

diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/util_avxb.h
index 5c03b1d88d7..34fafd188de 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 1b3810764b7..e658a4f848f 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_sseb.h b/intern/cycles/util/util_sseb.h
index d817e23c47e..56f8f676ba1 100644
--- a/intern/cycles/util/util_sseb.h
+++ b/intern/cycles/util/util_sseb.h
@@ -57,7 +57,7 @@ struct sseb {
   __forceinline sseb(const __m128 input) : m128(input)
   {
   }
-  __forceinline operator const __m128 &(void) const
+  __forceinline operator const __m128 &(void)const
   {
     return m128;
   }
diff --git a/intern/cycles/util/util_ssei.h b/intern/cycles/util/util_ssei.h
index a4db9193206..e2bf81310cc 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;
   }



More information about the Bf-blender-cvs mailing list